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

Re: Interim proposal for #3048, #3049 (interactive diff / resolution)

From: Karl Fogel <kfogel_at_red-bean.com>
Date: Mon, 04 Feb 2008 15:42:50 -0500

Eric Gillespie <epg_at_pretzelnet.org> writes:
> Karl Fogel <kfogel_at_red-bean.com> writes:
>> 3) Likewise change "(m)ine" and "(t)heirs" to "(M)ine" and "(T)heirs",
>> preserving the current in-full behavior.
>> 4) Likewise reserve lower-case "(m)ine" and "(t)heirs" for the
>> future behaviors, as per (2).
>> I think the above should be done as one change, and ported to 1.5.
> +1
> The --accept option is affected as well. I suggest
> --accept={mine,theirs} map to these new behaviors, and add
> only-mine and only-theirs (or something) to trigger the old.

Yes. And in the list, we should call the upper-case commands

   "(M)ine only"
   "(T)heirs only"
   "(D)iff full"

...or something like that.

I'm going to hand wave on the details, because I think it'll be easier
for me to figure that out as I'm implementing (and changing it in
response to feedback will be trivial, of course).


To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-02-04 21:43:02 CET

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.