[PATCH 0 of 2] New resolve command

[Adrian Buehlmann]

On 07.04.2008 00:26, Matt Mackall wrote:
> On Sun, 2008-04-06 at 16:46 -0500, Matt Mackall wrote:
> [nothing]
> 
> Oops, sorry about that.
> 
> These patches add a new 'resolve' command that is similar in
> functionality to the imerge extension, but more closely integrated
> with Mercurial.
> 
> Whenever update or merge attempts to merge a file, it first adds its
> contents to a temporary file in .hg/merge/ along with other
> information about the merge. This temporary copy also allows us to
> more correctly process overlapping moves and copies that occur during
> a merge.
> 
> If a file merge fails, the user is directed to the resolve command.
> With -l, this lists the state of all merged files, either 'R'esolved
> or 'U'nresolved. The -m and -u options allow individual files to be
> marked or unmarked as resolved. With no options, resolve retries the
> merge of unresolved files, using the temporary copy as its base.
> 
> Still to be done:
> 
> - improve the robustness of the resolve command
> - make commit abort if there are unresolved file merges
> - deprecate or remove the imerge extension
> 
> Comments?
>

\o/

Cool stuff. Moving imerge features into core Mercurial is great.
Thanks Matt!