Lost changes during merges
Mads Kiilerich
mads at kiilerich.com
Wed Jan 20 05:31:27 CST 2010
Pavel Shevaev wrote, On 01/20/2010 12:14 PM:
>> hg clone -r 7721 -r 7684 repo
>> (this will get only the parents of the merge, if you have other heads,
>> you'll need to pull them as well either by adding them as -r options
>> to the clone command or later by using pull -r)
>>
> I followed your advice and tried to reproduce the whole situation from
> the developer who made the merge(Darthvader) point of view:
>
> hg clone -r7718 -r7675 repo tmp #since he made 2 merges I started
> from the first one
> cd tmp
> hg merge #this went smoothly
>
Now you are redoing 7719:f4692a47d6bd. Was there a problem there too? I
thought the problem was 7722:180b55133042?
/Mads
More information about the Mercurial
mailing list