Re: Problems merging renamed file with contents changes

On Tuesday 10 September 2002 11:28 am, Karl Fogel wrote:
> Actually, this is a bug. Subversion is not supposed to delete a file
> that contains local mods -- in this case, it should leave the file in
> place and report a conflict (it doesn't have to be a rename, it could
> just be a delete that triggers this bug, right?).

I'm not sure about that. I did commit the changes in Bob's branch, so when I
did the merge, there were actually no local mods. The workspace was pristine.
Is this still a bug?

-- 
Colin D. Bennett <cbennett@radsoft.com>
[ RADSoft: Rapid Engineering Specialists ]
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org