Currently we are unable to merge to a target which has children that are copied
or moved.
For example, starting with the standard greek tree:
>set
URL=file:///C:/SVN/src-trunk/Release/subversion/tests/cmdline/svn-test-work/repositories/merge_tests-1
1) Make a branch
----------------
>svn copy %URL%/A/D merge_tests-1\A\D_COPY
A merge_tests-1\A\D_COPY\gamma
A merge_tests-1\A\D_COPY\G
A merge_tests-1\A\D_COPY\G\pi
A merge_tests-1\A\D_COPY\G\rho
A merge_tests-1\A\D_COPY\G\tau
A merge_tests-1\A\D_COPY\H
A merge_tests-1\A\D_COPY\H\chi
A merge_tests-1\A\D_COPY\H\omega
A merge_tests-1\A\D_COPY\H\psi
Checked out revision 1.
A merge_tests-1\A\D_COPY
>svn ci -m "" merge_tests-1
Adding merge_tests-1\A\D_COPY
Committed revision 2.
2) Make a mod to omega in the branch source
Commit it as r3
-------------------------------------------
>echo new content > merge_tests-1\A\D\H\omega
>svn ci -m "" merge_tests-1
Sending merge_tests-1\A\D\H\omega
Transmitting file data .
Committed revision 3.
3) Move omega in the branch
Commit it as r4
Update the WC
---------------------------
>svn move %URL%/A/D_COPY/H/omega %URL%/A/D_COPY/H/moved_omega -m ""
Committed revision 4.
>svn ci -m "" merge_tests-1
>svn up merge_tests-1
D merge_tests-1\A\D_COPY\H\omega
A merge_tests-1\A\D_COPY\H\moved_omega
Updated to revision 4.
>svn pl -vR merge_tests-1
Properties on 'merge_tests-1\A\D_COPY':
svn:mergeinfo : /A/D:1
Properties on 'merge_tests-1\A\D_COPY\H\moved_omega':
svn:mergeinfo : /A/D/H/omega:1
/A/D_COPY/H/omega:2-3
4) Merge r3 into the parent of the moved file
This fails...
---------------------------------------------
>svn merge -c3 %URL%/A/D merge_tests-1\A\D_COPY
svn: File not found: revision 4, path '/A/D/H/moved_omega'
Regardless of whether step 3 moves or copies a file or directory we see this
problem.
Bug
Critical
SVN-2821 Improve merge algorithm used for target trees with child paths which have mergeinfo that differs from their parent's
SVN-2877 do subtree merge only if subtree has explicit mergeinfo set and exists in the merge source