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

Problems with the merge log message templates

From: Martin Bischoff <tinu44_at_gmail.com>
Date: Tue, 2 Jun 2015 22:42:12 +0200


I found some problems with the merge log templates feature of TSVN 1.8.11:

1/ UI-problem in the merge log templates edit-window:
When editing the merge log templates, the third textbox (text for each
revision) is automatically resized to use the available height of the
Now when you enter some text, it is not possible to enter more lines
than fit into the current height of the textbox. Trying to enter more
text does not show a vertical scrollbar.
Another problem: if you make the window bigger (higher) and enter some
text to fill the full height of the textbox, then when you make the
window smaller, it is no longer possible to edit the now invisible
lines of the text.

2/ empty lines entered in the third textbox (text for each revision)
are ignored when composing the final merge log message.
It would be nice if they could be preserved.

3/ when I use the {revisions}, {revisionsr} and {revrange} keywords in
the title string, I get some strange (incorrect) result in the final
merge log message. This problem is a little bit hard to describe, but
I'll try and hope you can reproduce it:

I have the following situation: a repository with trunk and one branch
"b1". The repository contains the following revisions:

revision 1: new repository with trunk,branches, tags folders
revisions on trunk: 1, 3, 4, 5, 11
revisions in branch "b1": 8 (branch created from trunk_at_1), 10
maybe also important: the log message template properties were added
on /branches in revisions 6 and 7

Now when I merge from trunk into b1, then I get different results for
the three keywords, depending on what revisions I merge:

a) merging a single revision from trunk into b1: all three keywords
are expanded correctly.

b) merging revisions 3,4,5 from trunk into b1:
{revisions} = empty -> NOT OK, should be "3, 4, 5"
{revisionsr} = "r3, r4, r5" -> OK
{revrange} = "r3-r5" -> OK

c) merging revisions 5 and 11 from trunk into b1:
{revisions} = empty -> NOT OK
{revisionsr} = "r3, r5, r6, r7, r8, r9, r10, r11" -> NOT OK (revisions
6,7,8,9,10 are not in trunk)
{revrange} = "5-11" -> OK? (as there are no other revisions between 5
and 11 on trunk)

also in this case, the generate merge log message contains the
messages of revisions 5, 8, 10 and 11 (which is not correct, since
revisions 8 and 10 were revisions on branch b1, not on trunk.

I'm not sure how helpful this description is, but I hope it helps
reproduce the issue(s). Also I have not tried with a nightly build.

Let me know if you need more information.



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-06-02 22:42:23 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.