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

RE: svn commit: r33288 - in trunk/subversion: svn tests/cmdline tests/cmdline/svntest

From: Bert Huijben <b.huijben_at_competence.biz>
Date: Fri, 26 Sep 2008 15:29:41 +0200

> -----Original Message-----
> From: C. Michael Pilato [mailto:cmpilato_at_collab.net]
> Sent: vrijdag 26 september 2008 15:22
> To: Blair Zajac
> Cc: Greg Stein; dev_at_subversion.tigris.org; julianfoad_at_tigris.org
> Subject: Re: svn commit: r33288 - in trunk/subversion: svn
> tests/cmdline tests/cmdline/svntest
>
> Blair Zajac wrote:
> > It sounds like the only two people who said anything about it agreed
> on
> > the change but we're waiting for feedback. So maybe after N days
> with
> > no feedback the change is made?
> >
> > Anyway, this bikeshed is very easy, what character do you want in the
> > 'svn status' output for a new column for a tree conflict?
>
> If it's truly that simple, then "C" is my answer. We've got "C" for
> text
> conflicts, "C" for prop conflicts, and so "C" from tree conflicts seems
> reasonable. The only other letter that comes to mind is "T" (for
> "Tree"),
> but "tree" is just a modifier here -- "conflict" is the noun we care to
> report on. (Plus, we already use "T" for sTolen locks.)

+1 on the 'C' (bikeshed).

I think current users will understand that it is some kind of conflict without reading the manual.

        Bert

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-09-26 15:29:51 CEST

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