Backout of a backout and merge

[Jouni Airaksinen]

I suppose I don't understand something from backouts, but we had some 
trouble with backouts. The core of the situation is such that in default 
branch we have a change which was merged to another branch. Now this 
change was backout in the default branch and separately in the second 
branch where the change was merged (technically the backout was 
transplanted, but I tested and it doesn't matter if it's done with backout 
itself). OK, I understand when simplified you could have just merged the 
backout from default to the another branch, but due customer requests the 
changes had to be managed individually. 

So we had now change made in default and backout in both branches the 
change was appearing. Now later the backout was backout in the default 
branch to get the change back. Default branch looks fine, but when merging 
to the another branch (no other merges was done in between) the backout of 
backout was not merged automatically. This affected normal diff changes 
and file add/remove operations.

I was able to test this with plain repository (hg version 
1.9+7-308e1b5acc87). Originally in real code it happened with some 
Mercurial version coming with TortoiseHg (not my workstation).

Is this correct way of backouts that they are not mergeable or is there 
something I'm missing on how backout works? It was just little bit WTF 
when some change was missing after merge. 

-jouni
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial/attachments/20111202/866e688b/attachment.html>