So I do a 'darcs rebase pull' say yes to everything until I see how many
patches it wants to suspend, perhaps look at a few of them. Then I say
'q' to cancel. I get

[...]
Shall I suspend this patch? (7/38)  [ynW...], or ? for more options: q
Suspend cancelled.
darcs: failed to read patch:
patch 9766caccd0af2009ad151588bd80100c3ba79cda
Author: Invalid <invalid@invalid>
Date:   Wed Mar  7 02:41:52 CET 2018
  * DO NOT TOUCH: Rebase patch
  This patch is an internal implementation detail of rebase, used to
  store suspended patches, and should not be visible in the user
  interface. Please report a bug if a darcs command is showing you this
  patch.
Patch not stored in patch bundle:
patch 9766caccd0af2009ad151588bd80100c3ba79cda
Author: Invalid <invalid@invalid>
Date:   Wed Mar  7 02:41:52 CET 2018
  * DO NOT TOUCH: Rebase patch
  This patch is an internal implementation detail of rebase, used to
  store suspended patches, and should not be visible in the user
  interface. Please report a bug if a darcs command is showing you this
  patch.

Apparently there is no test for this. The situation requires manual
editing of _darcs/hashed_inventory to fix. A must-fix before release IMO.

I have the suspicion that this could be due to the "nasty hack" (says
the comment, but I agree) in src/Darcs/UI/Commands/Rebase.hs line 731,
but I am not sure.

A closer look at the message reveals this line:

"Patch not stored in patch bundle:"

Huh? Patch bundle? Then I remembered that the unvert patch is stored as
a bundle and indeed

ben@yuiitsu[1]:.../darcs/hunkmove>grep -r 'DO NOT TOUCH' _darcs 
_darcs/tentative_hashed_inventory:[DO NOT TOUCH: Rebase patch
_darcs/hashed_inventory:[DO NOT TOUCH: Rebase patch
_darcs/patches/unrevert:[DO NOT TOUCH: Rebase patch

After removing the unrevert bundle everything is fine:

ben@yuiitsu[1]:.../darcs/hunkmove>rm _darcs/patches/unrevert 
ben@yuiitsu[1]:.../darcs/hunkmove>darcs rebase log             
Rebase finished!
ben@yuiitsu[1]:.../darcs/hunkmove>grep -r 'DO NOT TOUCH' _darcs
ben@yuiitsu[1]:.../darcs/hunkmove>

Do we have tests for interaction of revert with rebase?

Attched is a failing shell test.

Attachments

• accept-issue2575_-rebase-then-revert-leaves-rebase-patch-in-unrevert-bundle.dpatch

I pushed the failing test patch to screened and reviewed.