[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn cleanup switches?

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: 2004-02-19 13:08:00 CET

Philip Martin wrote:
> "Brian W. Fitzpatrick" <fitz@red-bean.com> writes:
>
>>Why does svn cleanup take any switches at *all*? I'd say this is a
>>bug. Anyone?
>
> Cleanup reruns log files and that could involve running a merge, thus
> the user needs to be able to set --diff3-cmd. The diff3 command can
> also be set in the config file, thus the user needs to be able to set
> --config-dir.

Yes, but... yuck! That's all very well for a developer of Subversion, but very much relies on the user knowing how it works. Say my friend has just run the "project-check-in" script that his administrator provided, and it failed with some error about a locked working copy. My friend has heard of this "svn cleanup" which can recover from such situations. So he runs "svn cleanup", and things get worse (a merge is done wrongly). The administrator explains to him, "Oh, no - you shouldn't have run that command without figuring out what the active config dir and merge command were when the failing Subversion command was executed."

I think we need to build in a bit more "intelligence". For instance, maybe the log file could record the merge command that it was going to use.

- Julian

>>$svn help cleanup
>>cleanup: Recursively clean up the working copy, removing locks, resuming
>>unfinished operations, etc.
>>usage: cleanup [PATH...]
>>
>>Valid options:
>> --diff3-cmd arg : use ARG as merge command
>> --config-dir arg : read user configuration files from directory ARG

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Feb 19 13:03:46 2004

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.