[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 17:56:46 CET

Mark Benedetto King wrote:
> On Thu, Feb 19, 2004 at 12:08:00PM +0000, Julian Foad wrote:
>>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.
> That would make it a bad idea to type "svn cleanup" in an untrusted WC.

I don't know how serious that risk is, but there are variations that reduce it. For example, "svn cleanup" could just check that the name of the merge command that it is about to use matches the name of the merge command that the log file recorded, and warn the user if not. I'm not saying that's an elegant solution, just one of many possibilities.

Or perhaps we could revise the "clean up" strategy so that it does not involve merging. Instead of re-trying the merge, it could just put the relevant files into the "conflicted" state, as if the merge had been attempted but had failed. This might be less friendly (depending on what the user was going to do next), but it might be better overall if it is safer and simpler.

- Julian

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Feb 19 17:52:28 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.