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

Re: Merge tracking bug?

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Tue, 14 Oct 2008 18:46:45 +0200

Thomas Börkel wrote:
> HI!
>
> When I merge something from branch1/subfolder1 to branch2/subfolder2,
> the merge tracking infos are being recorded in subfolder2 properties.
>
> Now, when I do another merge on the same level, I can see in Show Log,
> which revisions from branch1/subfolder1 are already there, because they
> are grey.
>
> But when I do another merge on the top level, from branch1 to branch2,
> the revisions from previous merges on subfolders are NOT grey in Show Log.
>
> On the other hand, if I do just Show Log (without merge) on branch2, I
> can see all merges when I enable the "Include merged revisions" checkbox.
>
> Why does it have the information from subfolder there, but not when I do
> a merge?

Does this also happen if you deactivate the log cache in the settings
dialog? I assume it will.
This would be a limitation of the svn library, not TSVN.

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net

Received on 2008-10-14 18:47:16 CEST

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