[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Problem with merging a branch back to trunk

From: Sebastian Bergmann <sb_at_sebastian-bergmann.de>
Date: Thu, 13 Nov 2008 07:26:48 -0500

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. 

-- 
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
Received on 2008-11-13 13:27:26 CET

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.