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

merge fails - svn: URL xxx/xxx doesn't match existing url xxx/yyy

From: Jeb <jeb.beasley_at_penske.com>
Date: 2006-05-09 18:04:03 CEST

I did the following from the command line
svn co http://.....branches/offshore/JavaSource c:\proj\da\JavaSource
cd c:\proj\da\JavaSource
svn sw http://....branches/dev_gh/JavaSource
svn merge http://....branches/dev_gh/JavaSource

Then I get the following

D com_penske_delegatedadmin_actions.dnx
A com_penske_delegatedadmin_actions.dnx
D conf\delegatedadmin.properties
D conf\ApplicationResources.properties
D conf\deladminlinks.properties
D conf\log4j.properties
D conf

Stopped with error

svn: URL
fshore/delegatedadmin/JavaSource/conf' doesn't match existing URL
aSource/conf' in 'conf'

echo %errorlevel%
errorlevel 9009

Files should not be deleted, the exist in both branches.

thanks for any help you can provide


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue May 9 18:05:52 2006

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.