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

Re: How to merger repositories from the different svn server

From: Mike Mason <mgm_at_thoughtworks.net>
Date: 2004-11-19 02:33:54 CET

Tomasz Kopacz wrote:

> Is it possible to merge items from different subversion servers?
>
> For example, I have a similar tree on server A and B, both tree are
> changed etc.
>
> But then Id like to merge changes from server A and B any
> suggestion/help?
>

You could use "svn diff" to generate a "patch file", which is a list of
your changes, then use that to patch the new directory on the other
repository. Suppose revision 35 contains the changes you want to copy:

proj1> svn diff -r34:35 > r35.patch
proj2> patch -p0 < ../proj1/r35.patch

This copies textual changes from one working copy to another, but won't
pick up file adds, deletes, or renames.

If you want to do something fancier, take a look at svk -- it can merge
changes between repositories. http://svk.elixus.org/

Cheers,
Mike.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Nov 19 02:34:42 2004

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