[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict
From: |
Stephen Leake |
Subject: |
Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone) |
Date: |
Tue, 19 Jun 2012 07:56:57 -0400 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/23.2 (windows-nt) |
Markus Wanner <address@hidden> writes:
> Stephen,
>
> On 06/13/2012 03:20 PM, Stephen Leake wrote:
>> The user deleted a file by mistake. mtn has no clean mechanism for
>> undoing that, but it does have a reasonable workaround. I think you are
>> saying that using that workaround 'obscures die-die-die behavior'. Ok,
>> that's true. Why is that a problem? It is consistent with mtn in
>> general, and it is what the user wants. More importantly, it is not new;
>> it has been in mtn all along.
>>
>> The 'keep' resolution in nvm.issue-209 is just the workaround formalized
>> and made easy.
>
> That's exactly what I'm opposing to: it's still a work-around. It has
> its gotchas. And while it's certainly true that it's been with mtn so
> far, I don't consider that an argument for making the work-around less
> visible to the user; working behind the scenes - only to trap him later on.
>
> That being said, a warning in case the user chooses the keep-work-around
> might already suffice to mitigate my point. That should at least help
> making the user aware that the "keep resolution" isn't really a
> (re)solution, but just what it has always been: a work-around, now made
> easier to apply.
Ok, that makes sense. I did wonder whether to include something like
"history will be lost; see user guide" in the conflict resolution
message.
Can you suggest an appropriate warning?
--
-- Stephe
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), (continued)
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), Markus Wanner, 2012/06/05
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), Stephen Leake, 2012/06/05
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), Markus Wanner, 2012/06/06
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), Stephen Leake, 2012/06/07
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), Markus Wanner, 2012/06/08
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), Stephen Leake, 2012/06/09
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), Stephen Leake, 2012/06/09
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), Markus Wanner, 2012/06/11
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), Stephen Leake, 2012/06/13
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), Markus Wanner, 2012/06/19
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone),
Stephen Leake <=
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), Markus Wanner, 2012/06/20
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), Stephen Leake, 2012/06/21
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), Hendrik Boom, 2012/06/11
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), Markus Wanner, 2012/06/12
[Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), code, 2012/06/19
[Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), code, 2012/06/21