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

Tree conflicts - high-priority User Interface tasks

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Sat, 18 Oct 2008 14:00:39 +0100

Here are some high-priority UI tasks for getting tree conflict handling
to a releasable state.

  * "svn status" must be able to print "tree conflict" status on a
victim that is not a versioned item in the WC (which happens when
merging a deletion into a branch where the item was deleted earlier or
never existed).

  * "svn status" must not print "C" on the parent.
  (That's easy apart from loads of Python tests to adjust.)

  * There must be a way to use "svn merge" to merge a required change
into a WC to resolve a tree conflict. (The merge currently fails if
there is any conflict already flagged, which is usually the desired
behaviour, but not when you're trying to resolve a conflict and need to
use a merge.)

  * Notifications from "update", "switch", "merge" need to show "C" on
the victim in a new column, rather than "C" on the parent in the first

- 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-10-20 12:15:19 CEST

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