Problem merging a copy

[Luigi Paioro <lu...@lambrate.inaf.it>]

Hello.

I've got a project, suppose named PrjA, versioned with Svn within a 
proper repository. In another Svn repository, I've another project 
named, suppose, PrjB. Within a directory of PrjA I've copied a past 
version of PrjA (no external link, just a copy), in order to create a 
separated branch. Such branch now has some functions which are obsolete 
and need to be updated. So I've used the merge command to update the new 
branch with PrjA[HEAD] revision:

~luigi/PrjB/PrjA > svn merge 1280:HEAD http://myurl.it/svn/PrjA/trunk

Everything works well, but when I try to commit the PrjB changes Svn 
tells me:

svn: Commit failed (details follow):
svn: Copy source and destination are in different repositories.

How can be possible? What's the problem?

Thanks in advance.

Luigi

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

Re: Problem merging a copy

[Garrett Rooney <ro...@electricjellyfish.net>]

On 9/25/06, Luigi Paioro <lu...@lambrate.inaf.it> wrote:
> Hello.
>
> I've got a project, suppose named PrjA, versioned with Svn within a
> proper repository. In another Svn repository, I've another project
> named, suppose, PrjB. Within a directory of PrjA I've copied a past
> version of PrjA (no external link, just a copy), in order to create a
> separated branch. Such branch now has some functions which are obsolete
> and need to be updated. So I've used the merge command to update the new
> branch with PrjA[HEAD] revision:
>
> ~luigi/PrjB/PrjA > svn merge 1280:HEAD http://myurl.it/svn/PrjA/trunk
>
> Everything works well, but when I try to commit the PrjB changes Svn
> tells me:
>
> svn: Commit failed (details follow):
> svn: Copy source and destination are in different repositories.
>
> How can be possible? What's the problem?

The problem is that you can't merge from one repository into another.
It's just not possible with the current svn client tools.  If you want
to transfer the revision history you'll have to use something like
svnadmin dump/load and svndumpfilter.

-garrett

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

Re: Problem merging a copy

[Luigi Paioro <lu...@lambrate.inaf.it>]

Wow! Thanks! This was the problem: a new file!

Thank you very much!

Luigi

Wim Coenen wrote:
> 2006/9/25, Luigi Paioro <lu...@lambrate.inaf.it>:
>> Hello.
>>
>> I've got a project, suppose named PrjA, versioned with Svn within a
>> proper repository. In another Svn repository, I've another project
>> named, suppose, PrjB. Within a directory of PrjA I've copied a past
>> version of PrjA (no external link, just a copy), in order to create a
>> separated branch. Such branch now has some functions which are obsolete
>> and need to be updated. So I've used the merge command to update the new
>> branch with PrjA[HEAD] revision:
>>
>> ~luigi/PrjB/PrjA > svn merge 1280:HEAD http://myurl.it/svn/PrjA/trunk
>>
>> Everything works well, but when I try to commit the PrjB changes Svn
>> tells me:
>>
>> svn: Commit failed (details follow):
>> svn: Copy source and destination are in different repositories.
>>
>> How can be possible? What's the problem?
> 
> I think you are experiencing this issue:
> http://subversion.tigris.org/issues/show_bug.cgi?id=2504
> 
> The problem is that any new files which have been added refer to
> the wrong repository, because subversion doesn't really support
> inter-repository merges. As a workaround, you may be able to 'revert'
> these new files to remove the repository reference, and then simply
> 'add' them.
> 
> greetings,
> Wim Coenen.

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