merge tracking bug

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.

>svn log -g -v
-------------------------------------------------------
r8 | tdettbor | 2012-04-18 09:11:04 +0200 (Mi, 18 Apr 2012) | 1 line
Changed paths:
   M /testdir/0500_COBOL/branches/branch_first/test3.txt
   M /testdir/0500_COBOL/branches/branch_second
   M /testdir/0500_COBOL/branches/branch_second/test2.txt

check in change from merge and change text3
-------------------------------------------------------
r7 | tdettbor | 2012-04-18 09:06:26 +0200 (Mi, 18 Apr 2012) | 1 line
Changed paths:
   M /testdir/0500_COBOL/branches/branch_first/test2.txt

edit text2 in branch first
-------------------------------------------------------
r6 | tdettbor | 2012-04-18 09:04:21 +0200 (Mi, 18 Apr 2012) | 1 line
Changed paths:
   M /testdir/0500_COBOL/branches/branch_second/test1.txt

edit text1 in branch second
-------------------------------------------------------
r5 | tdettbor | 2012-04-18 08:45:17 +0200 (Mi, 18 Apr 2012) | 1 line
Changed paths:
   A /testdir/0500_COBOL/branches/branch_second (from /testdir/0500_COBOL/branches/branch_first:4)

creating second branche
-------------------------------------------------------
r4 | tdettbor | 2012-04-17 17:04:50 +0200 (Di, 17 Apr 2012) | 1 line
Changed paths:
   M /testdir/0500_COBOL/branches/branch_first
   M /testdir/0500_COBOL/branches/branch_first/test1.txt

commit change
-------------------------------------------------------
r3 | tdettbor | 2012-04-17 16:56:04 +0200 (Di, 17 Apr 2012) | 1 line
Changed paths:
   M /testdir/0500_COBOL/trunk/test1.txt

change text1.txt in trunk
-------------------------------------------------------
r2 | tdettbor | 2012-04-17 16:51:33 +0200 (Di, 17 Apr 2012) | 1 line
Changed paths:
   A /testdir/0500_COBOL/branches/branch_first (from /testdir/0500_COBOL/trunk:1)

creating first branche
-------------------------------------------------------
r1 | tdettbor | 2012-04-17 16:30:52 +0200 (Di, 17 Apr 2012) | 1 line
Changed paths:
   A /testdir
   A /testdir/0500_COBOL
   A /testdir/0500_COBOL/branches
   A /testdir/0500_COBOL/tags
   A /testdir/0500_COBOL/trunk
   A /testdir/0500_COBOL/trunk/test1.txt
   A /testdir/0500_COBOL/trunk/test2.txt
   A /testdir/0500_COBOL/trunk/test3.txt

check in first structur for testing
-------------------------------------------------------

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2950125

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].