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

Merge notification 'U' for interactive resolution - not 'G'?

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Fri, 15 Aug 2008 01:50:51 +0100

When "svn merge" pops up my 3-way merge tool (kdiff3) and I resolve the
conflicts and save, it then reports 'U' as the notification for the file
that I've just helped it to merge. Isn't it supposed to report 'G' like
it does when it merges a file with no help from me?

I'm asking from the point of view of what we want the user's experience
to be, not about why the implementation currently prints 'U'.

- 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-08-15 02:51:11 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.