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

Re: svn switch when rebasing repository?

From: Torgeir Veimo <torgeir_at_pobox.com>
Date: Fri, 29 Feb 2008 15:29:10 +0000

On 29 Feb 2008, at 15:17, John Peacock wrote:

> Torgeir Veimo wrote:
>> I',m trying this from within the src2 directory, which contains the
>> trunk and branches subdirectories, some of which has local changes.
>> svn switch --relocate seems to be only for changing the actual
>> hostname?
>
> No, 'switch --relocate' actually functions by rewriting the locally
> stored metadata as strings. This is precisely what you should use
> in this case, since you changed the repo out from under the working
> copies.

This is what I get

Macintosh:src torgeir$ svn switch --relocate svn://hostname svn://
hostname/project
svn: 'svn://hostname/project' is not the root of the repository

> IMPORTANT NOTE: if you filtered *any* revisions out when you did the
> dump/reload, you will have to throw away these working copies, as
> they will no longer be in sync with the repo; i.e. they will think
> you are at revision 1234, but the repo will think it is at revision
> 1111, and you will be unable to do anything. You can always retain
> your local changes by running 'svn diff' (which doesn't contact the
> repo at all) and squirrel those changes away to reapply after you
> recheckout the code.

I did actually filter out one single commit. I did not drop that
commit using --drop-empty-revs or --renumber-revs.

I also committed a new directory, the /project directory before i did
the load, so I assume the revision numbers are off by one. Would this
give the above error message?

-- 
Torgeir Veimo
torgeir_at_pobox.com
Received on 2008-02-29 16:30:38 CET

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