2015-06-05 20:59 GMT+02:00 Stefan Küng <tortoisesvn_at_gmail.com>:
> On 05.06.2015 11:30, Martin Bischoff wrote:
>
>> 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:
>
> Fixed the double revisions in r26558.
>
>> 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).
>
> Clear the log cache (Settings->save data->clear). The log cache is used
> to figure out which revisions in a range were actually merged.
>
> Maybe that will fix this.
Unfortunately it's not fixed - it gets even worse:
I tried again with the latest nightly build (1.8.99.26564) on a fresh
virtual PC (so no cached logs). I tested both the 32 and 64 bit
versions (on Windows 7 / 8.1).
When I merge revisions 4 and 11 from trunk, the Merge (progress-)
window is shown, e.g:
-----
Merging r4
...
Merging r11
...
Merged (green)
-----
Then TSVN hangs! CPU and Memory usage go up (100% / 1.5 GB). After
some minutes the crash reporting dialog is shown, but unfortunately I
was so far not able to send the crash information because this dialog
also seems to hang (CPU usage of sendrpt.exe is 98%).
I'll let the crash reporting run for some more (the progress bar is
moving very slowly) - so maybe you'll get anything useful.
Let me know if I should provide any other information.
-Martin
>
>> 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.
>
> {revisionsr} is used for multiple revisions. But for the single
> revisions in the template for merged revisions there's no need for
> another keyword. Just use "r{rev}".
>
> 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=3121128
>
> To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3121976
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-06-11 10:59:02 CEST