[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: Eric Gillespie <epg_at_pretzelnet.org>
Date: Mon, 04 Feb 2008 12:33:41 -0800

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.


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.

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-02-04 21:33:52 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.