Re: Update that removes a modified file

Philip Martin <pmartin@uklinux.net> writes:

> $ svn up -r11 trial
> $ svn st trial/another_foo.c
> M trial/another_foo.c
> $ svn up -r12 trial
> D trial/another_foo.c

This behavior alone is a bug, IMO. If
svn_wc_remove_from_revision_control detects that the object has local
mods, it should not just abort, but the user should see an "obstructed
update" error of some kind. Is that happening, or did you leave that
part out?

> Leaving the modified file in the working copy is probably a good idea,
> (although renaming it might be better) but shouldn't the admin bits be
> deleted?

No. The deletion should fail; your local mod conflicts with the
update. If you revert your local mod, then the update should succeed
(i.e. the deletion will finish correctly.)

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:36:48 2006