Re: merge tracking bug

On 20.04.2012 11:26, Torsten Dettborn wrote:
> Hello,
>
> I used tortoise for a while and found this bug.
>
> What i have done:
>
> 1: checked in three files(text1.txt, text2, text3.txt) in the trunk
> 2: make a branch "branch_first"
> 3: modify text1.txt in trunk
> 4: and merged 3: into branch_first
> 5: make a branch "branch_second" from "branch_first"
> 6: modify text1.txt in branch_second
> 7: modify text2.txt in "branch_first"
> 8: merged 7: to the "branch_second"
> 9: modify text3.txt in branch_first
>
> What i want to do:
>
> Merge branch_first to branche_second with the tortoiseSVN GUI
> I go to the file browser opened branch_second right click -> tortoiseSVN -> merge -> Next (in the Dialog) -> Show log (in the rectangle "Revision range to merge)
>
> In the first table i expected that revision 4 should be grey, because this is a non-mergeable revision. I make a screenshot and attach it to the topic. The merge was done correct, only the view is incorrect.
>
> Hopefully there is anyone who can fix the bug.

Settings dialog->Advanced->LogFindCopyFrom --> set to true.

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=2950230
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].