Patch 2288 resolve issue2700: rebase pull spurious ... (and 1 more)

Title resolve issue2700: rebase pull spurious ... (and 1 more)
Superseder Nosy List bfrk
Related Issues
Status accepted Assigned To

Created on 2023-03-21.12:37:15 by bfrk, last changed 2023-06-24.00:38:10 by ganesh.

File name Status Uploaded Type Edit Remove
patch-preview.txt bfrk, 2023-03-21.12:37:14 text/x-darcs-patch
resolve-issue2700_-rebase-pull-spurious-conflicts-with-unrecorded.dpatch bfrk, 2023-03-21.12:37:15 application/x-darcs-patch
See mailing list archives for discussion on individual patches.
msg23154 (view) Author: bfrk Date: 2023-03-21.12:37:15
2 patches for repository http://darcs.net/screened:

patch 7fddbdbe9b2c94b476b338ac9956890f70118f99
Author: Ben Franksen <ben.franksen@online.de>
Date:   Sun Feb 26 22:40:31 CET 2023
  * resolve issue2700: rebase pull spurious conflicts with unrecorded

  The culprit here was

  patch b9117bbe58bad86463ed390c75aba9a2539a2c30
  Author: Ben Franksen <ben.franksen@online.de>
  Date:   Tue Mar  2 11:48:56 CET 2021
    * get rid of "nasty hack" in applyPatchesForRebaseCmd

  Finalizing a transaction also updates the index, which has an influence on
  the result of unrecordedChanges (which is called by tentativelyMergePatches)
  because the index is used to filter the working tree (unless --ignore-times
  is in effect). We eliminated a finalize/revert pair, which means we must
  call 'updateIndex' manually here. We normally don't change the working tree
  from inside a transaction, so this is a somewhat special situation.

patch 9af249013964d18a07dcf371a258b58e771e27d2
Author: Ben Franksen <ben.franksen@online.de>
Date:   Sun Feb 26 22:43:17 CET 2023
  * rebase: take applyToWorking out of doSuspend

  This makes rebase suspend a bit safer, since we can now finalize and update
  working inside a single 'withSignalsBlocked' block.
msg23362 (view) Author: ganesh Date: 2023-06-24.00:34:49
looks fine

(accepting quickly to make running tests easier for me given issue2705!)
Date User Action Args
2023-03-21 12:37:15bfrkcreate
2023-03-22 14:52:21bfrksetstatus: needs-screening -> needs-review
2023-06-24 00:34:50ganeshsetstatus: needs-review -> accepted-pending-tests
messages: + msg23362
2023-06-24 00:38:10ganeshsetstatus: accepted-pending-tests -> accepted