Lost changes during merges

[Mads Kiilerich]

Abderrahim Kitouni wrote, On 01/20/2010 10:12 AM:
> Hi,
>
> 2010/1/20 Pavel Shevaev<pacha.shevaev at gmail.com>:
>    
>> Folks, from time to time we at my company are facing strange issues
>> during merges: the code is getting lost for some reason.
>>
>> Here is one of such situations when my(pachanga) changes in revision
>> 7684(--some feature C) got lost during merge in revision 7722.

...

>> I asked the developer(Darthvader) who made the merge in 7722 revision
>> if he got at least any conflicts during merge and he told me
>> everything went smooth.
>>      
> Since mercurial doesn't do the merge by itself, it may be a bug in
> your merge tool.
>    

FWIW: Mercurial has premerge enabled by default and _will_ thus try to 
do the file merge by itself. And there is also the famous issue 1327 
where a previous merge silently is/was reused - depending on the hg version.

Mercurial had a similar how-to-recover-from-consequences-of-a-bad-merge 
issue described in http://mercurial.selenic.com/bts/issue1860. Perhaps 
you can use some of the same methods for your forensic analysis and 
recovery.

/Mads