On Thursday 13 November 2008 14:08:26 Sebastian Bergmann wrote:
> 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_d
>ependencies 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_d
>ependencies 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
I am not very familiar with this topic, but I think you should use
svn merge --reintegrate
See
http://svnbook.red-bean.com/en/1.5/svn.ref.svn.c.merge.html
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-11-13 13:17:29 CET