Re: Problems with the merge log message templates

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.

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.

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].