merge tool could print which

[Paul Hammant <pa...@hammant.org>]

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.

Thoughs?


Regards,

- Paul

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2393675

To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].