imerge status

Bastian Doetsch bastian.doetsch at gmx.de
Tue Jul 8 11:37:58 CDT 2008


Am Montag, den 07.07.2008, 21:46 +0200 schrieb Patrick Mézard: 

> 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 ?


I think resolve is doing a good job of replacing imerge. In
MercurialEclipse we've already substituted code calling imerge for
Mercurial version > 1.0.1 with hg resolve and resolve offers everything
we need.


> 2- Even if [1] is true, is there any reason to fix "imerge" (compatibility, missing feature...) ?


I would be nice to have this fixed as this enables a smooth transition
for tools that still use imerge. I wonder if there's a command to
determine capabilities in Mercurial - the way, we've implemented this is
quite hacky (parsing "unknown command" output when issuing hg resolve
and falling back to imerge if it occurs).

Best regards,
Bastian


> 
> I am not asking this on -devel because people may have interesting comments about this.
> 
> --
> Patrick Mézard
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://selenic.com/pipermail/mercurial/attachments/20080708/7633d3b7/attachment.htm 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Dies ist ein digital signierter Nachrichtenteil
Url : http://selenic.com/pipermail/mercurial/attachments/20080708/7633d3b7/attachment.pgp 


More information about the Mercurial mailing list