imerge status

Giorgos Keramidas keramida at ceid.upatras.gr
Thu Jul 10 09:24:07 CDT 2008


On Thu, 10 Jul 2008 09:59:32 -0400, Brendan Cully <brendan at kublai.com> wrote:
> On Thursday, 10 July 2008 at 16:54, Giorgos Keramidas wrote:
>> 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 :)

+1 from me.

Merging mid-sized codebases, like the project we had at my previous job,
I often had to merge branches with 7-10 thousand files, and upwards of
2,000 changesets.  The imerge extension's save/load was useful when I
found that I couldn't merge some change.  Then I would save the merge,
find someone who would be able to help me complete the merge, and load
the imerge state to continue.



More information about the Mercurial mailing list