You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Juergen Richtsfeld <Ju...@borland.com> on 2006/09/05 15:23:42 UTC
merging different repositories
hi!
i have a working repository A with a branch A1. i do nightly svndumps (backup). i created a new subversion repository B on another server and replayed the dump (into a new root directory, svnadmin load has that option).
i created a new directory with some files on A1 and tried to merge that to B1 (automatically exists because it's a backup).
i get
svn: The URL '<whatever>' has a different repository root than its parent
my merge command was
cd workingCopyOfB1
svn merge --ignore-ancestry -r revBeforeChangeOnA1:HEAD http://urlToA1
i thought that would work because it can track the changes in branch A1 and just apply them to the working copy. am I wrong?
jürgen
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: merging different repositories
Posted by Ryan Schmidt <su...@ryandesign.com>.
On Sep 5, 2006, at 17:23, Juergen Richtsfeld wrote:
> hi!
> i have a working repository A with a branch A1. i do nightly
> svndumps (backup). i created a new subversion repository B on
> another server and replayed the dump (into a new root directory,
> svnadmin load has that option).
>
> i created a new directory with some files on A1 and tried to merge
> that to B1 (automatically exists because it's a backup).
>
> i get
>
> svn: The URL '<whatever>' has a different repository root than its
> parent
>
> my merge command was
>
> cd workingCopyOfB1
> svn merge --ignore-ancestry -r revBeforeChangeOnA1:HEAD http://urlToA1
>
>
> i thought that would work because it can track the changes in
> branch A1 and just apply them to the working copy. am I wrong?
No, you cannot merge between repositories, only within a single
repository. If the two projects are related, then put them into the
same repository.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org