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

On Feb 6, 2007, at 16:38, Chris Seawood wrote:

> When processing changeset 5600, it appears as though svn removed
> common/src/KTask.c and then copied /trunk/common/src/KTask.c rather
> than
> copying /branches/vendor/common/src/KTask.c (or the working 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.

-- 
To reply to the mailing list, please use your mailer's Reply To All  
function
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org