hg resolve

[Brendan Cully]

On Friday, 19 December 2008 at 21:43, Peter Arrenbrecht wrote:
> On Fri, Dec 19, 2008 at 9:29 PM, Dirkjan Ochtman <dirkjan at ochtman.nl> wrote:
> > On 19/12/2008 10:07, Peter Arrenbrecht wrote:
> >>
> >> But no change to the default behaviour, meaning `hg resolve the/file`
> >> will clobber any manual resolving I've already done when I meant to
> >> say `hg resolve -m the/file`?
> >
> > The idea is that hg resolve without -a will be equivalent to -l.
> 
> But will `hg resolve the/file` still clobber work? I rarely just say
> `hg resolve`, so the -a fix is not much of a help to me.
> -parren

Right now merge files have two states, 'marked' (resolved) and
'unmarked' (need resolving). How about we add a third state,
'modified', which means that the file has been changed by the user
since the last resolution attempt (eg if the user has manually fixed
up the file). Attempting to merge a file in this state would abort
with a warning (unless you used -f), and you could use resolve -u to
put the file into 'unmarked' state so that a subsequent resolve would
start over on that file, clobbering the working dir changes.