Copy, Commit, Copy followed by Merge
From: Bryant Eastham <beastham_at_slc.mew.com>
Date: 2005-06-09 16:46:36 CEST
My apologies if this is a common issue, but my reading the book and scanning the previous posts didn't answer my question.
We switched from SourceUnsafe to Subversion a week ago. Recently and engineer was trying to merge a branch that he had created, but in a little bit of a weird way. The results were not intuitive...
Here is the sequence (although names have been changed, and the syntax is more for understanding than correctness):
svn copy dir_A his_branch
<work on his_branch>
svn copy file_C his_branch
<more work on his_branch>
svn merge -rX:HEAD his_branch trunk
The issue is that file_C shows as conflicted, with the one file being empty (r0). It appears that the merge operation doesn't track the parentage of file_C because it wasn't part of the commit that created the branch (rX).
Is this correct behavior or a bug?
This is an archived mail posted to the Subversion Users mailing list.