You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Andrew N Marshall <am...@checkpoints.com> on 2010/10/01 21:20:13 UTC
Unify Multiple Repositories, then switch?
I'm trying to merge multiple Subversion repositories into a single
repository without too much hassle on my users.
I did roughly the following:
> svnadmin dump old_repo> old_repo.dump
> svnadmin load combined_repo --parent-dir old_repo_path< old_repo.dir
> cd old_working_dir
> svn switch http://server/combined_repo_root/old_repo_path
svn: Repository UUID '47910ef9-e52f-470c-a5c0-0a25e3386063' doesn't match expected UUID '4b1b6bb6-f4d7-4649-9891-0302873c425d'
I also tried...
> svn switch --relocate http://server/old_repo_root http://server/combined_repo_root/old_repo_path
svn: The repository at 'http://server/combined_repo_root/old_repo_path
' has uuid '47910ef9-e52f-470c-a5c0-0a25e3386063', but the WC has '4b1b6bb6-f4d7-4649-9891-0302873c425d'
So switch doesn't work the way I expected, and obviously I can't make
multiple old repos share the same repository id. What are my
alternatives to perform the switch?
Re: Unify Multiple Repositories, then switch?
Posted by Ulrich Eckhardt <ec...@satorlaser.com>.
On Friday 01 October 2010, Andrew N Marshall wrote:
> I'm trying to merge multiple Subversion repositories into a single
> repository without too much hassle on my users.
>
> I did roughly the following:
> > svnadmin dump old_repo> old_repo.dump
> > svnadmin load combined_repo --parent-dir old_repo_path< old_repo.dir
> > cd old_working_dir
> > svn switch http://server/combined_repo_root/old_repo_path
No chance, because already the revision numbers and paths inside the
repository are different.
> svn: Repository UUID '47910ef9-e52f-470c-a5c0-0a25e3386063' doesn't match
> expected UUID '4b1b6bb6-f4d7-4649-9891-0302873c425d'
This is actually a good safeguard. Even if you got over that one, you would
break the other half of the working copies, and if you weaseled your way
around both you would have working copies with metadata that doesn't
correspond to the data in the repository. If you repaired that, too, you
would effectively be somewhere close to a completely new checkout.
What you can do is this:
1. Create a "final" revision, everybody is supposed to update their working
copies to that revision.
2. After merging, tell everyone what the corresponding URL and revision in the
new repository is, so users can check that out easily.
3. Then, they can "svn export" from their local working copies and copy those
files over the new checkout, where they should have the exact same changes
but at the new location then.
Sorry.
Uli
--
ML: http://subversion.apache.org/docs/community-guide/mailing-lists.html
FAQ: http://subversion.apache.org/faq.html
Docs: http://svnbook.red-bean.com/
Sator Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland
Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932
**************************************************************************************
Sator Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland
Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932
**************************************************************************************
Visit our website at <http://www.satorlaser.de/>
**************************************************************************************
Diese E-Mail einschließlich sämtlicher Anhänge ist nur für den Adressaten bestimmt und kann vertrauliche Informationen enthalten. Bitte benachrichtigen Sie den Absender umgehend, falls Sie nicht der beabsichtigte Empfänger sein sollten. Die E-Mail ist in diesem Fall zu löschen und darf weder gelesen, weitergeleitet, veröffentlicht oder anderweitig benutzt werden.
E-Mails können durch Dritte gelesen werden und Viren sowie nichtautorisierte Änderungen enthalten. Sator Laser GmbH ist für diese Folgen nicht verantwortlich.
**************************************************************************************
Re: Unify Multiple Repositories, then switch?
Posted by Ryan Schmidt <su...@ryandesign.com>.
On Oct 1, 2010, at 16:20, Andrew N Marshall wrote:
>
> I'm trying to merge multiple Subversion repositories into a single repository without too much hassle on my users.
>
> I did roughly the following:
>
>> svnadmin dump old_repo> old_repo.dump
>> svnadmin load combined_repo --parent-dir old_repo_path< old_repo.dir
>> cd old_working_dir
>> svn switch http://server/combined_repo_root/old_repo_path
> svn: Repository UUID '47910ef9-e52f-470c-a5c0-0a25e3386063' doesn't match expected UUID '4b1b6bb6-f4d7-4649-9891-0302873c425d'
>
>
> I also tried...
>
>> svn switch --relocate http://server/old_repo_root http://server/combined_repo_root/old_repo_path
> svn: The repository at 'http://server/combined_repo_root/old_repo_path
> ' has uuid '47910ef9-e52f-470c-a5c0-0a25e3386063', but the WC has '4b1b6bb6-f4d7-4649-9891-0302873c425d'
>
>
> So switch doesn't work the way I expected, and obviously I can't make multiple old repos share the same repository id. What are my alternatives to perform the switch?
Users must check out new working copies.