[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Special case when merging a branch to the main trunk

From: Reinstein, Shlomo
Subject: Special case when merging a branch to the main trunk
Date: Wed, 5 Dec 2001 12:30:51 +0200


A file that we removed on a branch has a new revision on the main trunk
(after the branch was created). When we merge the branch into the main
trunk, CVS keeps the file with the new revision, and does not report a
In our specific case, the merge should remove the file, because the changes
done along the branch make this file useless. Of course, CVS can't just
remove that file when we merge, because it cannot know which of the changes
we prefer, the one along the branch or the new revision on the main trunk.
However, I would expect CVS to report a conflict in this case.
When using the "-t" global option, I see that CVS recognizes this case. I
think it's a bug that it doesn't report a conflict. What do you think?


reply via email to

[Prev in Thread] Current Thread [Next in Thread]