imerge status

Brendan Cully brendan at kublai.com
Thu Jul 10 08:59:32 CDT 2008


On Thursday, 10 July 2008 at 16:54, Giorgos Keramidas wrote:
> On Mon, 07 Jul 2008 21:46:29 +0200, Patrick Mézard <patrick.mezard at gmail.com> wrote:
> > Hello,
> >
> > The imerge extension has been broken in development repositories for a
> > couple of months now, and it's not really clear what to expect about
> > it. It was broken by the introduction of the "resolve" command. So:
> >
> > 1- Is "resolve" a good replacement for "imerge", so we can drop the
> > latter ?
> >
> > 2- Even if [1] is true, is there any reason to fix "imerge"
> > (compatibility, missing feature...) ?
> 
> Hi Patrick,
> 
> I liked imerge a lot when merge was `do it all, or wait'.  Now I've been
> using the new [merge-tools] options to merge stuff, and I don't feel
> like I am missing something.
> 
> I'm no sure if this fits the "missing feature" category, but what would
> be nice to have in either imerge or `hg resolve' would be a way to "save
> the state of a merge", in something like a bundle or similar file, and
> post the "half completed merge" to another developer, who can complete
> the merge later.  This is probably useful in large-ish teams, where an
> integrator has to merge something but discovers that he can't complete
> the merge without the help of someone else.

imerge did this (imerge save|load), but mpm wasn't convinced anyone
found it useful. So if people do, they should speak up :)


More information about the Mercurial mailing list