On 22 Dec 2001 13:37:40 +0000
Philip Martin <philip@codematters.co.uk> wrote:
> Karl Fogel <kfogel@newton.ch.collab.net> writes:
>
> > $ svn rm has-local-mods.c
> > ==> leaves has-local-mods.c, but schedules it for removal from
> > revision control
>
> Could we rename the working copy file, to has-local-mods.c.NNN say, so
> that the original name no longer exists in the working copy?
That could work, but what if we just do a diff and save the local mods
as a conflict? That way, the user will have to deal with the conflict before
doing the commit. If we create a conflict patch file, how would that interact
with the svn mv command? We could move the file in its unmodified state
and create a conflict patch file for the destination. I think the current code
moves the modified file so that the new file shows up in the M (modified) state.
I am not sure which is better, as long as the old file is removed I will be happy.
Mo
---------------------------------------------------------------------
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:53 2006