This happens to us too, most annoying. I have no solution except to avoid checking out old versions of the code. :-P
-----Original Message----- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] Behalf Of Mark Cooper Sent: Wednesday, March 19, 2003 12:12 PM To: [EMAIL PROTECTED] Subject: Re: Branch Merging Behaviour OK, I give up. I'll just have to report this as an issue and see if I can get a response that way. Mark Cooper Mark Cooper 17/03/2003 14:47 To: "Mark Cooper" <[EMAIL PROTECTED]> cc: Subject: Re: Branch Merging Behaviour Is this question not even worthy of the group? Having once again perused the archives I have found this mentioned a few times, but surprisingly not a single response (not even to tell the question poser to RTFM!), not even from the ever entertaining Mr. Jones..... Mark Cooper "Mark Cooper" <[EMAIL PROTECTED]> Sent by: [EMAIL PROTECTED] 17/03/2003 10:11 To: [EMAIL PROTECTED] cc: Subject: Branch Merging Behaviour We have recently noticed a difference in the way that a merge works between two branches and between a branch and the main trunk. Consider the following: branch taken from trunk work proceeds some files removed from trunk (head) new branch taken from trunk working copy updated to new branch first branch merged into new branch What appears to be happening under this scenario is that the files that were removed from the trunk but which still exist in the early branch are re-added into the new branch, then when in its turn the new branch is merged back into the trunk, the files are re-added to the trunk. This has caused us a couple of headaches wondering why removed files kept mysteriously re-appearing on the trunk. This does not occur when doing a merge of a branch into a working copy of the the trunk (head revisions). Is this behaviour correct? I've searched through previous mailing list archives and issue/bug reports, but can't find any reference to this. The manual is particularly obscure about the subject. Mark Cooper Reuse Manager Microlise Limited http://www.microlise.co.uk mailto:[EMAIL PROTECTED] _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
