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

Re: WG: Trivial, but extremely useful feature

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Wed, 10 Mar 2010 21:48:52 +0100

On 09.03.2010 09:12, Tamas (Thomas) Kis wrote:
> Hello Tortoise-ers,
>
> Recently I had to merge quite a big projects, and as usual some
> conflicts occur. In such cases it is very difficult to know which file
> is exactly conflicting, because the Tortoise UI shows only the filename
> (without path).
>
> Of course we have got multiple files with the same name (e.g. property
> file of a project).
>
> Please, take a look at the screenshot:
>
> The location of conflicting file cannot be figured out (neither from
> recent log entries, nor using “edit conflict” editor).
>
> I think a simple title for location of conflicted resource would
> extremely increase usability.

Done in r18893.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2457809
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-03-10 21:49:02 CET

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