Re: 'svn merge' on branch incorrectly applies 'svn mv' changes made on trunk

On Wednesday 07 February 2007 12:20, Ryan Schmidt wrote:
[...]
> > copy's common/src/KTask.c) into my working copy at
> > common/kernel/src/ KTask.c .
> > Is that the correct behavior for svn?
>
> That is the way Subversion currently functions, yes, because
> renames are handled as a copy (with history) followed by a delete.
> That this is undesirable in your scenario is clear, but that's
> unfortunately where Subversion is right now. Hopefully the "true
> rename" support, which is coming eventually, will make this
> situation better.

Is this something that "--ignore-ancestry" could help with? I've been
getting confused about what it is good for.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Feb 14 19:47:26 2007