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

merge tool could print which

From: Paul Hammant <paul_at_hammant.org>
Date: Fri, 11 Sep 2009 12:50:39 -0500

I'm intending to raise a feature request for this, and as per the
advice for raising issues, am discussing it here first.

If you're merging from say trunk to branch, you're offered merge
conflicts to work through.

For normal processing you'll see :

    "Conflict discovered in 'foo/bar'
    Select one of p, df, e, mc, tc, s"

    (or words to that effect.)

If you've plugged in kdiff3 via the diff3-cmd setting in the config
file (or I guess on the command line), then the "banner" is somewhat
more cryptic when svn hands off to that diff3 tool. It does not print
the file-name it is about to process. Kdiff three only shows the
tempfiles (a, b, c) as what its working on, when it opens its window,
so some guesswork is required.

I want to raise a feature request for svn to always banner the current
file, whether its built-in merge arbitration, or via launched tool.



- Paul


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-11 19:51:28 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.