You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Daniel Jacobsen <da...@gmail.com> on 2008/12/16 13:13:47 UTC
Merging repositories
Hi,
I have two SVN repositories that contain very similar file trees.
However, they have been used independently for a long time so that
many folders and files are unique to each tree, and many files exist
in different revisions in each repository.
How do I merge the two repositories together? I've tried the svnadmin
dump and svnadmin load, but that does not work - the error is:
svnadmin load /svn < dumpfile2
<<< Started new transaction, based on original revision 1
svnadmin: File already exists: filesystem '/svn/db', transaction 'ip',
path 'branches'
* adding path : branches ...server1:
Any help is greatly appreciated.
Daniel
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=984966
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
RE: Merging repositories
Posted by Bob Archer <Bo...@amsi.com>.
I don't think there is an easy way to do this. If you just want to get
have is in Repo A into Repo B.. you probably just need to update the
Repo B working directory with the files that are missing from Repo A and
then commit them. Of course, you won't have any history from the
previous revisions or logs or such.
An other idea... start from the base revision of WC-a and copy them over
to WC-b and commit this. Then create a patch for each revision after
that in WC-a. Apply that patch to WC-b and commit it. This way you can
move the log messages as you commit each patch. Yes, very manual.
BOb
> -----Original Message-----
> From: Daniel Jacobsen [mailto:daniel.jacob.jacobsen@gmail.com]
> Sent: Wednesday, December 17, 2008 4:16 AM
> To: Andy Levy
> Cc: users@subversion.tigris.org
> Subject: Re: Merging repositories
>
> On Tue, Dec 16, 2008 at 5:31 PM, Andy Levy <an...@gmail.com>
wrote:
> > On Tue, Dec 16, 2008 at 08:13, Daniel Jacobsen
> > <da...@gmail.com> wrote:
> >> Hi,
> >>
> >> I have two SVN repositories that contain very similar file trees.
> >> However, they have been used independently for a long time so that
> >> many folders and files are unique to each tree, and many files
exist
> >> in different revisions in each repository.
> >>
> >> How do I merge the two repositories together? I've tried the
svnadmin
> >> dump and svnadmin load, but that does not work - the error is:
> >>
> >> svnadmin load /svn < dumpfile2
> >> <<< Started new transaction, based on original revision 1
> >> svnadmin: File already exists: filesystem '/svn/db', transaction
'ip',
> >> path 'branches'
> >> * adding path : branches ...server1:
> >
> > http://subversion.tigris.org/faq.html#multi-merge
> >
>
> Thanks for the link, but I don't want to put one repository into the
> other - I need to combine them into one repository, and both
> repositories have the same basic file tree (with small differences due
> to living independently for a long time).
>
> Daniel
>
> ------------------------------------------------------
>
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageI
d=
> 985591
>
> To unsubscribe from this discussion, e-mail: [users-
> unsubscribe@subversion.tigris.org].
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=986795
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: Merging repositories
Posted by Daniel Jacobsen <da...@gmail.com>.
On Tue, Dec 16, 2008 at 5:31 PM, Andy Levy <an...@gmail.com> wrote:
> On Tue, Dec 16, 2008 at 08:13, Daniel Jacobsen
> <da...@gmail.com> wrote:
>> Hi,
>>
>> I have two SVN repositories that contain very similar file trees.
>> However, they have been used independently for a long time so that
>> many folders and files are unique to each tree, and many files exist
>> in different revisions in each repository.
>>
>> How do I merge the two repositories together? I've tried the svnadmin
>> dump and svnadmin load, but that does not work - the error is:
>>
>> svnadmin load /svn < dumpfile2
>> <<< Started new transaction, based on original revision 1
>> svnadmin: File already exists: filesystem '/svn/db', transaction 'ip',
>> path 'branches'
>> * adding path : branches ...server1:
>
> http://subversion.tigris.org/faq.html#multi-merge
>
Thanks for the link, but I don't want to put one repository into the
other - I need to combine them into one repository, and both
repositories have the same basic file tree (with small differences due
to living independently for a long time).
Daniel
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=985591
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: Merging repositories
Posted by Andy Levy <an...@gmail.com>.
On Tue, Dec 16, 2008 at 08:13, Daniel Jacobsen
<da...@gmail.com> wrote:
> Hi,
>
> I have two SVN repositories that contain very similar file trees.
> However, they have been used independently for a long time so that
> many folders and files are unique to each tree, and many files exist
> in different revisions in each repository.
>
> How do I merge the two repositories together? I've tried the svnadmin
> dump and svnadmin load, but that does not work - the error is:
>
> svnadmin load /svn < dumpfile2
> <<< Started new transaction, based on original revision 1
> svnadmin: File already exists: filesystem '/svn/db', transaction 'ip',
> path 'branches'
> * adding path : branches ...server1:
http://subversion.tigris.org/faq.html#multi-merge
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=985115
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=988159
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: Merging repositories
Posted by Konstantin Kolinko <kn...@gmail.com>.
2008/12/16 Daniel Jacobsen <da...@gmail.com>:
>
> I have two SVN repositories that contain very similar file trees.
> However, they have been used independently for a long time so that
> many folders and files are unique to each tree, and many files exist
> in different revisions in each repository.
>
> How do I merge the two repositories together? I've tried the svnadmin
> dump and svnadmin load, but that does not work - the error is:
>
> svnadmin load /svn < dumpfile2
> <<< Started new transaction, based on original revision 1
> svnadmin: File already exists: filesystem '/svn/db', transaction 'ip',
> path 'branches'
> * adding path : branches ...server1:
>
You can use --parent-dir option of svnadmin load command to load the
dump into a subdirectory of your repository. You should create that
subdirectory (empty) in your repository before running with that option.
See the book,
http://svnbook.red-bean.com/en/1.5/svn.reposadmin.maint.html#svn.reposadmin.maint.migrate
Best regards,
Konstantin Kolinko
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=992030
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: Merging repositories
Posted by Andy Levy <an...@gmail.com>.
On Tue, Dec 16, 2008 at 08:13, Daniel Jacobsen
<da...@gmail.com> wrote:
> Hi,
>
> I have two SVN repositories that contain very similar file trees.
> However, they have been used independently for a long time so that
> many folders and files are unique to each tree, and many files exist
> in different revisions in each repository.
>
> How do I merge the two repositories together? I've tried the svnadmin
> dump and svnadmin load, but that does not work - the error is:
>
> svnadmin load /svn < dumpfile2
> <<< Started new transaction, based on original revision 1
> svnadmin: File already exists: filesystem '/svn/db', transaction 'ip',
> path 'branches'
> * adding path : branches ...server1:
http://subversion.tigris.org/faq.html#multi-merge
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=985115
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].