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

Re: [PATCH] Add option to resolve conflicts by selecting a specific file (Issue 2784)

From: Jeremy Whitlock <jcscoobyrs_at_gmail.com>
Date: 2007-06-08 18:16:24 CEST

Hi All,
    Makes sense to me. Remember, this has been discussed and until
now, no one had actually made a concrete request to change the
verbiage. The verbiage will be changes in all necessary locations.

Take care,


On 6/8/07, Karl Fogel <kfogel@red-bean.com> wrote:
> Eric Gillespie <epg@pretzelnet.org> writes:
> > Unfortunately, i don't think we've finished painting this
> > particular bikeshed yet ;->. I finally went and got myself a
> > conflict so i could see if we could take name inspiration from
> > there. So, how about svn_accept_{old,new,work} with strings
> > "left", "new", and "working"?
> I can't believe I'm writing this, http://green.bikeshed.com/, etc, but:
> let's avoid needless grammar variations. svn_accept_{old,new,working}
> would perfectly match the adjectives we actually use.
> -Karl

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jun 8 18:16:34 2007

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.