[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: C. Michael Pilato <cmpilato_at_collab.net>
Date: Fri, 26 Sep 2008 09:22:17 -0400

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.)

C. Michael Pilato <cmpilato_at_collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand

Received on 2008-09-26 15:22:46 CEST

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.