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

Re: merge two different repositories

From: Ryan Schmidt <subversion-2007b_at_ryandesign.com>
Date: 2007-04-11 14:34:55 CEST

On Apr 11, 2007, at 06:40, ufuk kocolu wrote:

> I had a repository of a running application, a web site, when I
> needed to develop a new module (that is deeply integrated in this
> application and certainly would break and harm the already running
> web site) I created a new repository. But I had to make some
> updates,fix some bugs in this old version (running source) and now
> I have merge these two. I imagine that will be a very hard job and
> a major pain.
>
> Which way should I choose to do this job?

Merging repositories is easy. You "svnadmin dump" both old
repositories, then "svnadmin create" a new repository, then "svnadmin
load" both dumpfiles into the new repository.

Note that your revisions will now not be in chronological order. The
only side-effect of this is that the -r {DATE} feature will not work.
If you want -r {DATE} to work, then you can use the repomerge.py
script to load the two dumpfiles with revisions interleaved to
preserve chronological order:

http://svn.haxx.se/users/archive-2006-01/1168.shtml

Whichever way you choose, you will need to throw out all existing
working copies from the old repositories and check out new working
copies from the new repository once you're done loading.

The revision numbers in the new repository will now likely not be the
same as the revision numbers in the old repositories, especially if
you interleaved the revisions using repomerge.py. If you ever had any
comments in your log messages that referenced specific revision
numbers, these will no longer be accurate.

-- 
To reply to the mailing list, please use your mailer's Reply To All  
function
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Apr 11 14:35:35 2007

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