Re: Merge limitation, or am I ignernt?

On Oct 23, 2004, at 4:45 PM, Davy Durham wrote:
>
> Any help would be appreciated.
>
>

The problem is that Subversion doesn't have "true" atomic renames. It
implements renames as "copy and delete". When you run that last merge
command, you get 'fred.c' added to your working copy, and 'foo.c' is
deleted. (Of course, the deletion should give you a conflict -- you
can't delete something with local edits. I believe what happens is
that 'foo.c' just ends up as an unversioned file.)

This merging annoyance is well-known, and just one of many reasons we
plan to implement real renames someday.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Oct 24 15:33:24 2004