Re: Log caching: Crash in `Get merge logs' without access to the repository root

On Fri, Mar 11, 2016 at 6:40 PM, Stefan Kueng <tortoisesvn_at_gmail.com> wrote:

> Patch looks good!
> Please commit.
>
> But while I was going through the code and already made some similar
> changes as in your patch I got an idea:
>
> maybe we could remove the separate handling of logs with/without merge
> info completely and just use one code path for all situations?
>
> This would mean getting rid of the call to InternalLogWithMerge() and call
> InternalLog() instead. Then we could also remove the CMergeLogger() class.
>
> I'm doing some testing with that change (not finished yet) soon.
> But in the mean time: what do you think?
>
>
>
Actually, there's more needed to make it work properly. Your patch fixes
the crash, that's good.
But if there are actually merged revisions shown/fetched, then the skip
range gets messed up.
We have to 'ignore' all the merged revs that come in and not use them for
book keeping. We only have to update the cache and report those revisions
back to the caller, but *not* use them for e.g. updating the skip ranges.
If we do, then instead of one log call we get at least one more, maybe even
two.

I have something working so far, but before I commit I'd like to do some
more testing.
I'll commit my change tomorrow if I don't find any other problems...

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3165424
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].