Checkout
svn-role
committed
on 12 Jul 18
Merge the r1833836 group from trunk:

* r1833836, r1833842
Fix issue #4740, "conflict resolver searches too far back ..."
Justificati… Show more
Merge the r1833836 group from trunk:

* r1833836, r1833842

  Fix issue #4740, "conflict resolver searches too far back ..."

  Justification:

    The current behaviour is hard-coded to traverse all of history in

    a "local missing vs incoming edit" situation. This is impractical

    on repositories with a large number of revisions.

    Easy fix which just runs an already existing YCA search a bit

    earlier, falling back to full traversal if no YCA can be found.

    User complained and provided a reproduction script:

    https://svn.haxx.se/users/archive-2018-04/0060.shtml

  Votes:

    +1: stsp, philip, jcorvel

Show less