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

Re: Conflict resolution dialog improvement request

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Thu, 15 Apr 2010 20:23:08 +0200

On 13.04.2010 17:13, Hans-Emil Skogh wrote:
> Hi!
> Would it be possible to add the path of the source and/or destination
> files in the conflict resolution-helper dialog?
> If you have multiple (similar) files with the same name it can be
> difficult to make the correct choice when performing large merges.
> Having the complete path to the file vissible would help deciding if to
> use the local file, the one from the repository, or if an edit is needed.

Sorry, not possible since the svn library doesn't give us that information.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2584121
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-04-15 20:24:13 CEST

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

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