Tree conflicts on merging into a branch
From: Matthias Weyh <m.weyh_at_technisat.de>
Date: Thu, 29 Apr 2010 08:25:46 +0200
I have seen an issue with subversion in which tree conflicts are being
Please refer to the following sequence. Is this supposed to be happening
>svn co https://localhost/svn/test
test>svn add trunk branches tags
test>svn commit -m "initial structure"
Committed revision 1.
test>svn switch https://localhost/svn/test/trunk
test>echo loremipsum > d1\f1.txt
test>echo loremipsum > d2\f1.txt
test>echo loremipsum > d3\f1.txt
test>svn add d1 d2 d3
test>svn ci -m "stuff"
test>svn copy . https://localhost/svn/test/branches/b1 -m "created b1"
Committed revision 3.
test>svn rename d1 d1_r
test>svn commit -m "d1 renamed"
Committed revision 4.
test>svn switch https://localhost/svn/test/branches/b1
test>svn merge https://localhost/svn/test/trunk
D:\repositories\test>svn status -v
This is an archived mail posted to the Subversion Users mailing list.