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

Re: 'svn resolved' (past tense) actually performs resolution now?

From: Eric Gillespie <epg_at_pretzelnet.org>
Date: Tue, 25 Mar 2008 12:16:24 -0700

"Mark Phippard" <markphip_at_gmail.com> writes:

> On Mon, Mar 24, 2008 at 4:17 PM, C. Michael Pilato <cmpilato_at_collab.net> wrot
> e:
> > Eric Gillespie seemed to agree, noting that he envisions an 'svn resolve'
> > subcommand that can do the full range of interactive conflict resolution
> > magic someday (which gets a hearty +1 from me), but his initial willingnes
> s
> > to bifurcate today's 'resolved' subcommand was doused by Mark Phippard's
> > insistence that all is well (or at least well enough) with the UI as it is

Well, I think Mark and David raised an important point:

> Adding a new subcommand, especially one that varies by a single
> character, does not seem like a solution. Why would users not be
> confused by the new subcommand? Do I have to run svn resolved after I
> run svn resolve?

That confusion worries me. Hm, how about:

- move the --accept option to a new 'resolve' command (which in
  some post-1.5 release will also offer the full functionality)
- drop --accept from 'resolved'
- document 'resolved' as a deprecated alias for 'resolve --accept=merged'

> confused. Why not just add a new option like --accept=current or
> in-place or something like that. This at least gives the user that
> thinks they need to specify an option, an option that does not change
> the contents of the file.

It sounds like you're looking for --accept=merged?

> I am commenting because I really like the new feature, and like the
> way we were able to integrate it into Subclipse. I am sure
> TortoiseSVN did the same.

How we implement the command-line UI does not impact how you or
Tortoise implement your own UI. The functionality is available
to you no matter which subcommand we use.

Eric Gillespie <*> epg_at_pretzelnet.org

To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-03-25 20:16:37 CET

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