Merge Repositories

["Achim Domma (SyynX Solutions GmbH)" <ac...@syynx.de>]

Hi,

I want to merge one repository into another one. According to the faq I 
should be able to do a svnadmin dump and then a reload. The problem is, 
that there are folders with the same name in both repositories which 
causes conflicts if I do a svnadmin load.

I tried to move the all folders in the old repository into a 'backup' 
subfolder, but this does not work because the old revisions still need 
the folder?

How can I solve this problem?

I conficting folders are not important to me, so if it would be possible 
to erase the folder completely from the old repository, that would be ok.

Any hint would be very appreciated!

regards,
Achim


---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Merge Repositories

[Ryan Schmidt <su...@ryandesign.com>]

On Nov 5, 2005, at 18:04, Achim Domma (SyynX Solutions GmbH) wrote:

> I want to merge one repository into another one. According to the  
> faq I should be able to do a svnadmin dump and then a reload. The  
> problem is, that there are folders with the same name in both  
> repositories which causes conflicts if I do a svnadmin load.
>
> I tried to move the all folders in the old repository into a  
> 'backup' subfolder, but this does not work because the old  
> revisions still need the folder?
>
> How can I solve this problem?

I think you want the --parent-dir argument of svnadmin load.

$ svnadmin help load
load: usage: svnadmin load REPOS_PATH

Read a 'dumpfile'-formatted stream from stdin, committing
new revisions into the repository's filesystem.  If the repository
was previously empty, its UUID will, by default, be changed to the
one specified in the stream.  Progress feedback is sent to stdout.

Valid options:
   -q [--quiet]             : no progress (only errors) to stderr
   --ignore-uuid            : ignore any repos UUID found in the stream
   --force-uuid             : set repos UUID to that found in stream,  
if any
   --use-pre-commit-hook    : call pre-commit hook before committing  
revisions
   --use-post-commit-hook   : call post-commit hook after committing  
revisions
   --parent-dir arg         : load at specified directory in repository


> I conficting folders are not important to me, so if it would be  
> possible to erase the folder completely from the old repository,  
> that would be ok.

svnadmin load will load all of the old repository. You can clean it  
up later. That way you preserve the history. If you want to throw out  
certain directories from the old repo before importing, you can do  
that using svndumpfilter exclude.

$ svndumpfilter help exclude
exclude: Filter out nodes with given prefixes from dumpstream.
usage: svndumpfilter exclude PATH_PREFIX...

Valid options:
   --drop-empty-revs        : Remove revisions emptied by filtering.
   --renumber-revs          : Renumber revisions left after filtering.
   --preserve-revprops      : Don't filter revision properties.
   --quiet                  : Do not display filtering statistics.



---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org