Re: Merge limitation, or am I ignernt?

Ben Collins-Sussman wrote:

>
> 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.)
>
I guess I should be able to at least get a guess that the problem has
occured if I see a "D" followed by "A" then.

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

Any idea with this will take place? I know it'd it be a guess...

Thanks for the information.

I do think it'd be a good idea to mention this caveat/pitfall/gotcha in
the book's chapter 4.

Thanks,
   Davy

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