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

Re: "svn resolve" becomes "svn resolved"

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: 2003-07-29 16:03:59 CEST

Wolf Josef wrote:
>>>>Lots of people agreed that "svn resolve" should change to "svn
>>>>resolved" to better reflect its meaning and reduce
>>>>confusion (thread "'svn revert' vs. 'svn resolve'"). Some
>>>>people proposed additional changes, which I am not discussing
> Named thread had another proposal: let "svn resolve" (or "svn foobar",
> after renaming it) fire up your editor with all the conflicting files
> in it. I think such a feature would be very nice because finding all
> the conflicting files and editing/"svn resolving" them one by one
> results in veeery much monotone typing.

It would certainly be handy in some common situations. However it is not a tidy and general solution: not all conflicts can or should be resolved by a bit of editing in an editor - e.g. binary files; property conflicts. So the feature would have dangling edge cases and switches and options to tell it what to do. I don't like any of these cases where "svn" launches your editor, even though I agree that they are handy in certain situations.

So we want a handy way to resolve a batch of text conflicts but I don't want "svn" to do it. I hate to mention scripts again because it has connotations of "Do It Yourself" but I think we should make an effort to get some scripts for features like this one into the core distribution of "svn" so that people recognise that they are a valid and documented part of the package, not "DIY".

> Renaming to "resolved" would lead to confusion if above mentioned
> feature would be added at some time in the future. Do you really
> want to close the door for it?

It would only lead to confusion if that feature were implemented under the name "svn resolved". It could still be implimented later under a different name such as "svn resolve".

- Julian

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Jul 29 16:05:22 2003

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.