Jeremy Wilkins wrote:
> Hi,
>
> I've got two repositorys that got created from the same tar ball of
> files, when I make changes to one repository I've been moving them
> across to the other with 'svn diff -rx:y url | patch -p0'
>
> I've tried to move the changes across with svn merge with the
> --ignore-ancestry option, this has happily patched the files but when
> I commit I get the 'Source url ... is from different repository' error
> though. I thought ignore ancestry meant that the differing ancestry of
> the files would be ignored. Is there any way round this or is it back
> to patching with 'svn diff | patch -p0'
The --ignore-ancestry option only comes into play when files are
replaced (deleted and added with the same name).
I suppose you get this error only when new files were added during the
merge? An add during a merge is implemented as a copy from the original
location, so if that was in another repository that information cannot
be stored in the repository.
As a workaround you can merge first. Then revert all the copied (marked
as added+) files so they will become unversioned, this will remove the
copied-from link with the original repository. You can then add those
files again and commit.
hope this helps,
Lieven.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Sep 20 17:33:55 2006