On 14 March 2016 at 23:23, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
> On 14.03.2016 15:57, Ivan Zhakov wrote:
>
>>> There are cases when that wouldn't work, since the merge-aware log is
>>> very different. For example 'svn log -g -c 27193
>>> https://svn.code.sf.net/p/tortoisesvn/code/branches/1.9.x' reports the
>>> following revisions:
>>> [[[
>>> r27193 | steveking | 2016-02-22 21:25:45
>>> ------------------------------------------------------------------------
>>> r27179 | ivan-z | 2016-02-22 13:09:20
>>> Merged via: r27193
>>> ------------------------------------------------------------------------
>>> r27177 | ivan-z | 2016-02-19 18:30:56
>>> Merged via: r27193
>>> ------------------------------------------------------------------------
>>> r27176 | ivan-z | 2016-02-19 18:28:26
>>> Merged via: r27193
>>> ------------------------------------------------------------------------
>>> r27175 | ivan-z | 2016-02-19 18:27:41
>>> Merged via: r27193
>>> ------------------------------------------------------------------------
>>> r27169 | steveking | 2016-02-10 22:22:11
>>> Merged via: r27193
>>> ------------------------------------------------------------------------
>>> r27168 | steveking | 2016-02-10 22:20:50
>>> Merged via: r27193
>>> ------------------------------------------------------------------------
>>> r27167 | steveking | 2016-02-08 23:27:58
>>> Merged via: r27193
>>> ]]]
>>>
>>> But log caching doesn't have information about merges and would report
>>> just r27193 if it's cached. To reproduce with TortoiseSVN trunk_at_27240:
>>> 1. Enable Log Caching
>
> Ups! That's what I forgot to reactivate ;)
>
>>> 2. Start TortoiseSVN log for
>>> https://svn.code.sf.net/p/tortoisesvn/code/branches/1.9.x:
>>> TortoiseProc.exe /command:log
>>> /path:https://svn.code.sf.net/p/tortoisesvn/code/branches/1.9.x
>>> /startrev:27193 /endrev:27193
>>> 3. Click "Include merged revisions"
>>> Merged revisions will not be displayed, while they should. They may
>>> appear after pressing F5, but they will not be reported as merged.
>>>
>>> I think the best solution would be just to skip log caching completely
>>> for merge-aware logs. I'm going to prepare patch for this.
>>>
>> Here is the patch. Changes from trunk:
>> - Do not populate skip ranges from merge-aware log results.
>> - Request all range for merge-aware logs. Merge-aware log cannot be
>> requested by sub-ranges due to non-linear nature of merge-aware logs.
>
> Patch looks good, and works for me.
> Please commit.
>
Thanks for review. Committed in r27241.
--
Ivan Zhakov
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3165978
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2016-03-15 16:58:20 CET