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

Merging between 2 different repositories

From: Andreas Pakulat <apaku_at_gmx.de>
Date: 2006-04-08 19:54:33 CEST

Hi,

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_at_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

The same happens with a svn diff.

Now switching both URLS:
andreas_at_morpheus:~/compiling/aqbanking/svn/aqbanking.qt4>LANG=C svn diff https://www.apaku.de/subversion/aqbanking.qt4/trunk http://aquamaniac.homelinux.net/svn/aqbanking/trunk
svn: REPORT request failed on '/subversion/!svn/vcc/default'
svn: Unusable URI: it does not refer to this repository
andreas_at_morpheus:~/compiling/aqbanking/svn/aqbanking.qt4>LANG=C svn merge https://www.apaku.de/subversion/aqbanking.qt4/trunk http://aquamaniac.homelinux.net/svn/aqbanking/trunk
svn: REPORT request failed on '/subversion/!svn/vcc/default'
svn: Unusable URI: it does not refer to this repository

Trying to merge only a single file (which was changed in both
repositories, but on different lines):
andreas_at_morpheus:~/compiling/aqbanking/svn/aqbanking.qt4>LANG=C svn merge http://aquamaniac.homelinux.net/svn/aqbanking/trunk/configure.ac https://www.apaku.de/subversion/aqbanking.qt4/trunk/configure.ac

seems to work, but there are no changes merged. However I _know_ there
are 3 lines added in the aquamaniac-repository. A diff also doesn't work
when using the files and switching the urls brings in the changes done
in repository 1, but removes all changes done in repository 2 - I get
the repository 1-version of the configure.ac file.

All actions where done in the working copy of my own repository for that
project.

Could please someone tell me what I'm doing wrong or if this is not
possible at all? (And I have to revert to use diff+patch?)

Andreas

-- 
You'll be sorry...
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Apr 8 19:55:48 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.