[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: Justin Erenkrantz <justin_at_erenkrantz.com>
Date: Sat, 9 Feb 2008 14:15:39 +0100

On Feb 4, 2008 9:27 PM, Karl Fogel <kfogel_at_red-bean.com> wrote:
> In the issue, Mike Pilato proposes this solution: we let (m)ine
> and (t)heirs only make determinations on conflicting hunks, and
> reserve (M)ine and (T)heirs for mine-in-full and theirs-in-full.

I don't like case-sensitivity being meaningful.

How about adding ! - that is m! means mine-in-full and t! means
theirs-in-full. (Or do + or something else after the m/t
combination.)

But 'M' and 'm' meaning something different seems error-prone. -- justin

---------------------------------------------------------------------
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-09 14:15:52 CET

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