Hello,
I'm using:
- TortoiseSVN 1.6.0, Build 15855
- linux server: svn version 1.5.5 (r34862)
- svn repository has been upgraded using "svnadmin upgrade"
If I try to do a merge from a branch to trunk, and the branch name
contains a space, the "Show log" dialog still shows merged revisions
in black text. The expected behavior is that merged revisions are
shown in grey text. (if the branch name has no spaces, then this is
indeed the behavior)
To reproduce:
- create a branch with a space in the name, for example: "branch 05"
- make some changes in the branch, commit them, then merge "branch 05"
to trunk
* the trunk's svn:mergeinfo property is correctly set, for example: /
branches/branch 05:42
- start the merge wizard again in trunk:
* TortoiseSVN -> Merge -> Merge a range of revisions -> (select
"branch 05") -> click Show log (upper-right button)
- in the "Select revision range" dialog, the merged revisions are
displayed in black text instead of grey text
Could someone please confirm if this is indeed a TSVN problem?
If we rename the branch to a name with no spaces, the merged revisions
are now shown in grey text.
However, because the branch has been renamed, we always have to
disable the "stop on copy/rename" checkbox in the "Select revision
range" dialog, in order to view revisions older than the rename.
-Ronald
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1611617
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-04-09 11:30:58 CEST