Problem with merging a branch back to trunk

 I have a branch (feature/test_dependencies) that started out as a copy
 from trunk.

 All changes that have been made to trunk since the branch was created
 have been merged to the branch to keep it in sync.

 Now I want to merge the branch back to trunk but it does not work.

 I tried both

   $ svn merge svn+ssh://sb@svn.phpunit.de/var/svn/phpunit/phpunit/branches/feature/test_dependencies
   svn: Target path does not exist

 and

   $ svn merge -r 3952:4023 svn+ssh://sb@svn.phpunit.de/var/svn/phpunit/phpunit/branches/feature/test_dependencies
   svn: Working copy path 'PHPUnit/Tests/TextUI/debug.phpt' does not
   exist in repository

 where 3952 is the revision that started the branch and 4023 is the
 current revision.

 'PHPUnit/Tests/TextUI/debug.phpt' exists in both the branch and trunk.

 You can reproduce the situation like this

   - svn co svn://svn.phpunit.de/phpunit/phpunit/trunk
   - svn merge svn://svn.phpunit.de/phpunit/phpunit/branches/feature/test_dependencies

 Any help appreciated,
Sebastian

-- 
Sebastian Bergmann                          http://sebastian-bergmann.de/
GnuPG Key: 0xB85B5D69 / 27A7 2B14 09E4 98CD 6277 0E5B 6867 C514 B85B 5D69
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org