On Tue, 2003-06-10 at 22:39, Brian Denny wrote:
> Of course, if we do that, we might as well go another step and say that
> "revert" doesn't actually resolve/revert the conflicted file (unless you
> pass --force). ...Which is making more and more sense to me -- after all,
> a conflicted file is kinda different from a "local change" -- it's more
> of a weird, invalid state which has to be taken care of before you can
> do anything intelligent with it.
Ick. "svn revert" is how you turn a modified homedir into a clean one.
It shouldn't matter what kind of local mods you have.
I feel like there are too many options here to come to any kind of
consensus. So far, we have had advocates for at least the following:
* Doing nothing.
* Changing the name of "svn revert" (to undo)
* Changing the name of "svn resolve" (to unconflict, settle, resolved,
settled, or a few other options)
* Making "svn revert" require --force on conflicted files.
* Making "svn revert" leave behind .mine for conflicted files.
* Making "svn revert" leave behind all conflicts.
We also have opponents of various of these options, and a lot of people
who are either tired of this thread, or who don't want to drown the list
by posting every time yet another new proposal comes up.
I'm not sure what this means. Should a lack of opportunity for
meaningful consensus mean that the status quo should win out, if it's
not clearly inferior to the other options?
(I'm personally okay with doing nothing or with changing the name of
"svn resolve" to pretty much any of the given options; I suspect even
"svn resolved" would help eliminate mistyping just because the two
commands would no longer both be verbs. I'm very close to -1 on any of
the other options, because "revert" is such a well-accepted term and
because giving any kind of special treatment to conflicted files when
reverting seems like a terribly kludge.)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jun 11 04:55:13 2003