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

Re: Problems with the merge log message templates

From: Martin Bischoff <tinu44_at_gmail.com>
Date: Thu, 4 Jun 2015 13:40:09 +0200

Thanks for your reply.
I downloaded the latest nightly build (TortoiseSVN 1.8.99, Build 26555
- 64 Bit -dev, 2015/06/03 19:30:41) and retested the issues.
I still see some problems:

2015-06-03 20:31 GMT+02:00 Stefan Küng <tortoisesvn_at_gmail.com>:
> On 02.06.2015 22:42, Martin Bischoff wrote:
>> Hi,
>> 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
>> dialog.
>> 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.
> Fixed in r26554.

Confirmed it's fixed, thanks.

>> 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.
> Hmm, can't reproduce that with the latest build from trunk.

This still occurs, but I guess my report was not exact enough. It only
occurs for empty lines at the beginning of the log message of the
first merged revision.

E.g. my templates (used for testing) look like this (without the
dashes at the beginning/end):

Merged revision(s) -{revisions}-, -{revisionsr}-, -{revrange}- from {mergeurl}:

msg-template (note that there is an empty line at the beginning):

r{rev} ({author}):

The generated log message then looks like this:
Merged revision(s) -5, 6, 7, 8, 9, 10, 11-, -r5, r6, r7, r8, r9, r10,
r11-, -5-11- from trunk:
r5 (author-name):

r11 (author-name):

-> there should be an empty line before the line starting with "r5".

>> 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)
> Fixed in r26555.

As you can see in the example shown above, this is not completely
fixed. The result is now:

{revisions} = "5, 6, 7, 8, 9, 10, 11"
  -> NOT OK, should be "5, 11"
{revisionsr} = "r5, r6, r7, r8, r9, r10, r11"
  -> NOT OK (revisions 6,7,8,9,10 are not in trunk, should be "r5, r11")
{revrange} = "5-11"
  -> OK

>> 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.
> Well, that's a problem that has been fixed on trunk, but that change is
> excessive and requires some new svn API's that are not available for the
> 1.8.x branch, so that won't get fixed for those versions.

I can confirm, that it's fixed for the log message(s), but not for the
revisions-lists (see above).

Thanks for your support.



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-06-04 13:40:41 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.