Merging between 2 different repositories

[Andreas Pakulat <ap...@gmx.de>]

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

Re: Merging between 2 different repositories

[Andreas Pakulat <ap...@gmx.de>]

On 08.04.06 20:28:34, Ryan Schmidt wrote:
> On Apr 8, 2006, at 19:54, Andreas Pakulat wrote:
> 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

Now that you mention it: Yes that's exactly what I want to do.

Thanks,

Andreas

-- 
You will be awarded a medal for disregarding safety in saving someone.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Merging between 2 different repositories

[Ryan Schmidt <su...@ryandesign.com>]

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