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

Re: Why it is not BLUE after merge

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Thu, 08 Oct 2009 20:42:57 +0200

On 08.10.2009 17:19, esu2 wrote:
> Hi,
> I merged changes from branch, when I view the logs using "show log", my
> merged revision appeared as a normal line (black color). I do see some
> merged change by others appear as "blue" record.
>
> Did I do something wrong with my merge? although the content were merged
> correctly and I'm even able to see "svn:mergeinfo" properties on the
> directory correctly.

Entries that appear blue are not merged revisions but revisions where
the path/url for which you show the log for is affected directly.
This is only done for folders (a log for a file would otherwise show all
revisions in blue) - this way you can see immediately where the folder
you show the log for was either copied or modified directly (copied
means branched/tagged, modified means a property change).

Merged revisions are only shown (in grey) if you start the log dialog
from the merge dialog.

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=2405272
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-10-08 20:43:06 CEST

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