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

Re: Tree conflicts - command-line UI

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Mon, 15 Sep 2008 14:26:58 +0100

On Fri, 2008-09-12 at 15:26 -0400, Karl Fogel wrote:
> Julian Foad <julianfoad_at_btopenworld.com> writes:
> > Some sketches of what I think the UI should be.
> General comment: so we're going to show tree conflicts as a conflict on
> the parent, rather than on the entry where the conflict happened?

No! I'm saying we want to change that. Perhaps you mis-read the "Ready
now:" and "Desired:" descriptions, or I got one wrong, or you thought
"Ready now" meant "in its final desired form now", which it didn't.

> As a
> programmer, I totally get why that would be accurate. As a user, I'd be
> confused and never get used to it, though...

Agreed. Thanks for confirming this.

- Julian

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-15 15:22:28 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.