I've got two branches (children of trunk) that need to be merged into one branch for testing, but they can't go into trunk. Both branches are up-to-date with trunk@HEAD. So I want to go from this:
__________________trunk
\___duck \
\___beaver
to this:
__________________________trunk
\
\______________platypus
I created the branch platypus from the latest version of trunk, and am trying to merge duck and beaver into this new copy of trunk:
svn copy ^/trunk ^/branches/platypus;
svn switch ^/branches/platypus;
svn merge --reintegrate ^/branches/duck;
svn merge --reintegrate ^/branches/beaver;
but the merge ops fail
svn: '/blah/!svn/bc/12047/repo/branches/duck' path not found
If I try to --reintegrate duck (or beaver) into trunk it works fine. What am I missing here?