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

Rebasing to different vendor branch

From: Kenneth Porter <shiva_at_sewingwitch.com>
Date: 2006-01-12 02:40:40 CET

I'm using the "vendor branches" technique described in chapter 7 of The
Book, "Advanced Topics". I've been merging updates from the vendor to my
custom branch.

Now the vendor has abandoned the original branch and switched to another
branch within their revision control system and I've started a new
vendor branch in my repository. I'd like to rebase my custom branch to
this new vendor branch.

I try the following, to rebase my code from the vendor's vX to their vY

svn merge \
 http://server/vendor/vX/current \
 http://server/vendor/vY/current \

This runs for awhile and then one of the subdirectories of the project
fails with this message:

svn: URL 'http://server/vendor/vX/current/subdir' doesn't match existing
URL 'http://server/branches/mycustomization/subdir' in 'subdir'

What does this error mean?

Server is 1.3.0 on Linux. Client is 1.2.1 on WinXP.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jan 12 02:54:47 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.