Lost changes during merges

Pavel Shevaev pacha.shevaev at gmail.com
Wed Jan 20 05:47:34 CST 2010


> Now you are redoing 7719:f4692a47d6bd. Was there a problem there too?

No there was no problem I just wanted to trace all his merges.

> I thought the problem was 7722:180b55133042?

That's right problem happened in this revision.

I tried to clone the repo to get exactly to the problem as you
suggested(hg clone -r 7721 -r 7684 repo): I got the conflict during
the merge and I could clearly see my changes. Then I tried the earlier
revisions/merges and pulled in my changes(as described in my previous
email) but they all worked fine as well.

-- 
Best regards, Pavel


More information about the Mercurial mailing list