This is my first batch of V1 cleanups, enough to be
able to progress with "full unwind".

I am not screening them immediately because I have local
test failures that are almost certainly unrelated but
I need a bit more time to check that.

It's lots of small patches because that was how I
convinced myself the changes were right.

8 patches for repository darcs-unstable@darcs.net:screened:

patch 8ee7f24d03b8f83bc29323b06b7b06ca389e8ef1
Author: Ganesh Sittampalam <ganesh@earth.li>
Date:   Wed Feb 19 15:35:42 GMT 2020
  * V1: rename type variable to make Merger/Regrem consistent

patch f579acdbe2e3bf29f62e2bf03329b8ccede0726c
Author: Ganesh Sittampalam <ganesh@earth.li>
Date:   Wed Feb 19 15:35:49 GMT 2020
  * V1: inline call to unwind in merger

patch 6d00b6cba85a4c3c86d2b1dd5908cb7403e93f12
Author: Ganesh Sittampalam <ganesh@earth.li>
Date:   Wed Feb 19 17:57:30 GMT 2020
  * V1: leave unwindings in merger Sealed for longer

patch 86548685cb0d8c078098d65f5da5c4ee985a7829
Author: Ganesh Sittampalam <ganesh@earth.li>
Date:   Wed Feb 19 17:58:02 GMT 2020
  * V1: correct witness of conflicting patch parameter

patch 2ac716850023da39d617d4e8f9d357bf74b021c0
Author: Ganesh Sittampalam <ganesh@earth.li>
Date:   Wed Feb 19 17:58:02 GMT 2020
  * V1: cut down the unsafeCoercing in merger a bit

patch 91eacb4caa77e97fee7cd1449c3b6888aa2e0684
Author: Ganesh Sittampalam <ganesh@earth.li>
Date:   Wed Feb 19 17:58:02 GMT 2020
  * V1: use Sealed rather than unsafeCoercePEnd for undoit

patch 4a45fc1e82b72e57fba35c2566eb41d7dde53038
Author: Ganesh Sittampalam <ganesh@earth.li>
Date:   Wed Feb 19 17:58:02 GMT 2020
  * V1: move fake_p construction into trueUnwind

patch 66101dd33955b178165ff52fd573e01b5949949c
Author: Ganesh Sittampalam <ganesh@earth.li>
Date:   Wed Feb 19 17:58:02 GMT 2020
  * V1: make the non-empty return list from trueUnwind explicit

Attachments

• patch-preview.txt
• unnamed
• v1_-rename-type-variable-to-make-merger_regrem-consistent.dpatch

Actually I replicated the test failure (rollback.sh) without these
changes so I'm pushing this to screened now.

All fine, good work.