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

Re: Tree conflict for directory - insufficient information provided by TSVN?

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Thu, 24 Nov 2011 17:39:38 +0100

On 24.11.2011 09:38, Aviel wrote:
> Hi,
>
> Is it just me or does TSVN not provide enough information to understand what
> happened whereas the command line does?
>
> Doing "check for modifications" for a directory I get "normal, tree conflict"
> from TSVN. Not much information there.
>
> Doing the same w/ the cmdline I get :
>
> C ngc_files
> local add, incoming add upon update
>
> which is far more useful and I can now resolve the conflict.
>
> Am I missing something? it seems TSVN is lacking here in the information it
> provides to the user, compared to the command line client?

Right-click on the conflicted item, choose "edit conflict" and you'll
get all the information you need.

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=2886134
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-11-24 17:39:46 CET

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