Re: Bi-directional merge

[Larry Jones]

address@hidden writes:
> 
> A merge in B removed some code in one file (myfile.txt), the file was
> corrected and committed in B, on merge into the trunk I don't get the
> changes but I get a message that myfile.txt already contains the
> differences between 1.2 and 1.2.14.2.

Since 1.2 and 1.2.14.2 are identical, there aren't any changes to merge.
That's all the message is trying to tell you -- there's no reason to
create a new revision on the trunk since it would be idential to the
revision that's already there.

-Larry Jones

What's the matter?  Don't you trust your own kid?! -- Calvin