My operations are simple, but I do not understand the result. Who can help me? thanks a lot.
my os: win7 32bit my svn server: version 1.4.6 (r28521) my svn client: 1.6.16 (SlikSvn/1.6.16) WIN32 and my operations are: 1) create /svn-train-05/trunk & commit 2) add /svn-train-05/trunk/trunk.xml & commit 3) create branch /svn-train-05/branches/01 & commit 4) add /svn-train-05/branches/01/branch.xml & commit 5) add /svn-train-05/trunk/trunk copy.xml & commit 6) merge trunk to branch 01, and commit branch 01, all success! 7) merge branch 01 to trunk: 7.1) test merge, it's OK svn merge --dry-run svn://10.10.1.1/svn-train-05/trunk svn://10.10.1.1/svn-train-05/branches/01 . --- 正在合并版本库 URL 之间的差异到 “.”： A branch.xml 7.2) merge, it's a bug? svn merge svn://10.10.1.1/svn-train-05/trunk svn://10.10.1.1/svn-train-05/branches/01 . --- 正在合并版本库 URL 之间的差异到 “.”： A branch.xml --- 正在合并 r1264，经由 r1274，到 “.”: C branch.xml C trunk copy.xml 冲突概要： 树冲突：2 --- 正在反向合并 r1274，经由 r1264，到 “.”: D trunk copy.xml -------- And I run those commands with svn version 1.4.6 (r28521), both 'test merge' and 'merge' are all OK. So, my questions are: 1) the result of 'test merge' do not match 'merge'? 2) is the 'tree conflict' with version 1.6.16 a bug?
