Patch 2358 optimize conflict resolution in tentativelyMergePatches_

Title optimize conflict resolution in tentativelyMergePatches_
Superseder Nosy List bfrk
Related Issues
Status needs-review Assigned To

Created on 2023-08-24.16:48:03 by bfrk, last changed 2023-08-24.16:48:28 by bfrk.

File name Status Uploaded Type Edit Remove
optimize-conflict-resolution-in-tentativelymergepatches_.dpatch bfrk, 2023-08-24.16:48:02 application/x-darcs-patch
patch-preview.txt bfrk, 2023-08-24.16:48:02 text/x-darcs-patch
See mailing list archives for discussion on individual patches.
msg23694 (view) Author: bfrk Date: 2023-08-24.16:48:02
1 patch for repository http://darcs.net/screened:

patch 5b159a9fcfaf16aad7cea8cf56d95ffa54a41e51
Author: Ben Franksen <ben.franksen@online.de>
Date:   Sat Dec  3 15:46:23 CET 2022
  * optimize conflict resolution in tentativelyMergePatches_

  Examining patches for conflicts and then generating the markup is complex
  and scales poorly with the length of the sequence to be examined. So it
  makes sense to always choose the shorter of the two merged sequences to
  apply standardResolution on; the more so since in almost all cases occurring
  in practice the length of at least one of the two sequences is pretty short.
  However, this is only valid if the remote patches don't have unresolved
  conflicts in the first place. Detecting this condition requires another
  conflict resolution step, but one that is usually cheap because it can stop
  at the first clean tag.

  With this patch, pulling everything from a large repo (e.g. darcs screened)
  into an empty repository, while still not nearly as fast as a clone,
  completes in a reasonable time (and also doesn't run into darcs-2 commute
  bugs). This could be further improved by optimizing the process of updating
  the working tree which is a lot slower than updating pristine.
Date User Action Args
2023-08-24 16:48:03bfrkcreate
2023-08-24 16:48:28bfrksetstatus: needs-screening -> needs-review