Re: Possible svn 1.6 cp bug that leads to tree conflict?

On Thu, Nov 19, 2009 at 11:11:22AM +1100, Woon Wai Keen wrote:
> svnadmin create repo # create and checkout a repository
> svn co file:///$PWD/repo wc
> cd wc # create trunk, trunk/test, trunk/test/file
> svn mkdir trunk
> svn ci -m ''
> svn mkdir trunk/test
> touch trunk/test/file
> svn add trunk/test/file
> svn ci -m '' # shows adding branch, branch/test
> svn cp trunk branch # copy trunk to branch
> svn ci -m ''
> svn up
> cd trunk
> svn merge ^/branch . # now merge branch to trunk. this fails with a tree
> conflict
> --- Merging r2 through r3 into '.':
> C test
> Summary of conflicts:
> Tree conflicts: 1

I think you need --reintegrate to do the merge from the branch back to
trunk. Have you tried that?

tyler

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2420079

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-11-19 16:47:24 CET