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

Re: Merging between 2 different repositories

From: Ryan Schmidt <subversion-2006Q1_at_ryandesign.com>
Date: 2006-04-08 20:28:34 CEST

On Apr 8, 2006, at 19:54, Andreas Pakulat wrote:

> I have here 2 repositories (on different servers) where I'd like to
> merge the changes done in repository 1 (aka upstream) into
> repository 2
> (my own repository with some changes).
>
> To make this clear:
>
> repository 1 == http://aquamaniac.homelinux.net/svn/aqbanking
> repository 2 == https://www.apaku.de/subversion/aqbanking.qt4
>
> And I'd like to merge all changes done to repository 1 into the
> working
> copy of repository 2.
>
> However using
> andreas@morpheus:~/compiling/aqbanking/svn/aqbanking.qt4>LANG=C svn
> merge http://aquamaniac.homelinux.net/svn/aqbanking/trunk/ https://
> www.apaku.de/subversion/aqbanking.qt4/trunk/
> svn: REPORT request failed on '/svn/aqbanking/!svn/vcc/default'
> svn: Unusable URI: it does not refer to this repository

AFAIK, both URLs to an svn merge command need to be from the same
repository.

And that's what you should be using too, because that's actually what
I think you want: You want to get a list of changes that occurred in
repository 1 between timepoints A and B (where A is the last point in
the past at which you obtained their changes, and B is likely "now"),
and then apply those changes to a working copy you already have of
repository 2. So you just need to go into your working copy of
repository 2 and do the merge:

svn merge -rA:B repository1

However, both repositories do need to be using the same *protocol*
(e.g. http:, https:, svn:, svn+ssh:, file:); if they don't, you'll
get an error message about this. I can't explain why this should be
necessary, but it currently is.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Apr 8 20:29:51 2006

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