On Thu, Nov 13, 2008 at 07:26:48AM -0500, Sebastian Bergmann wrote:
> Sebastian Bergmann wrote:
> > $ 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
>
> Adding --ignore-ancestry here fixed the issue.
But that prevents mergeinfo from being added.
So your merge has probably not been recorded.
See here for an in-depth discussion of how you should be merging
your branch back to trunk, and why:
http://blogs.open.collab.net/svn/2008/07/subversion-merg.html
It's also documented in the book, see the 'feature branches'
section on this page:
http://svnbook.red-bean.com/en/1.5/svn.branchmerge.commonpatterns.html
Note that the error message you are seeing is likely a symptom of
an outstanding bug which has been / will be fixed in trunk and 1.5
soonish. See this issue:
http://subversion.tigris.org/issues/show_bug.cgi?id=3067
See also this thread for discussion on eliminating a possible root
cause of the problem:
http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=145213
Stefan
---------------------------------------------------------------------
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 14:28:33 CET