2015-06-04 20:13 GMT+02:00 Stefan Küng <tortoisesvn_at_gmail.com>:
> On 04.06.2015 13:40, Martin Bischoff wrote:
>> 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:
>>
>
>>>> 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):
>>
>> title-template:
>> -------------------------------------------------------------------
>> Merged revision(s) -{revisions}-, -{revisionsr}-, -{revrange}- from {mergeurl}:
>> -------------------------------------------------------------------
>>
>> msg-template (note that there is an empty line at the beginning):
>> -------------------------------------------------------------------
>>
>> r{rev} ({author}):
>> {msg}
>> ~~~~~~~~~~~~~~~~~~~~~
>> -------------------------------------------------------------------
>>
>>
>> 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):
>> message
>> ~~~~~~~~~~~~~~~~~~~~~
>>
>> r11 (author-name):
>> message
>> ~~~~~~~~~~~~~~~~~~~~~
>> -------------------------------------------------------------------
>>
>> -> there should be an empty line before the line starting with "r5".
>
> I've tried this on my dev machine, and it works as expected.
> Also, there's no reason why it would add an empty line for all
> subsequent entries but not the first.
Yes it works. It was my fault, I didn't have a newline at the end of
the title-template.
>
> However: newlines are handled specially: only \n and \r\n newlines are
> kept. If you use \r newlines (can only happen if you copy/paste the text
> into the dialog), then those are removed.
>
>> 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
>
> Should be fixed in r26557.
>
Hmm, just tried it with 1.8.99, build 26557 (rebooted after
installation, each test made in a new checkout of branch "b1").
It fixes the case where I merge revisions 5 and 11 (which are the last
two revisions on trunk).
But when I merge revisions 4 and 11, then I get this strange result:
-------------------------------------------------------------------
Merged revision(s) -4, 4, 3, 1, 11, 11, 5, 4, 3, 1-, -r4, r4, r3, r1,
r11, r11, r5, r4, r3, r1-, -4, 11- from trunk:
r4 (author-name):
msg of r4
~~~~~~~~~~~~~~~~~~~~~
r3 (author-name):
msg of r4
~~~~~~~~~~~~~~~~~~~~~
r1 (author-name):
msg of r4
~~~~~~~~~~~~~~~~~~~~~
r11 (author-name):
msg of r4
~~~~~~~~~~~~~~~~~~~~~
r5 (author-name):
msg of r4
~~~~~~~~~~~~~~~~~~~~~
r4 (author-name):
msg of r4
~~~~~~~~~~~~~~~~~~~~~
r3 (author-name):
msg of r4
~~~~~~~~~~~~~~~~~~~~~
r1 (author-name):
msg of r4
~~~~~~~~~~~~~~~~~~~~~
-------------------------------------------------------------------
Also the merge seems to be quite slow (> 10 seconds for an almost
empty repository).
BTW: would it be possible to support the keyword {revr} in the
template for the merged revisions? Or even {revisionr} to make it
consistent with the keywords supported in the title-template.
-Martin
> 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=3120917
>
> To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3121004
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-06-05 11:30:12 CEST