[darcs-devel] [patch1911] WIP: use Prim patches in rebase toedit

[Ganesh Sittampalam]

Ganesh Sittampalam <ganesh at earth.li> added the comment:

Updated version of migration to Prim, resolving conflicts
with patch1914 (which simplifies this bundle).

I think the backwards compatibility story needs a bit
more investigation. I realised that suspending conflicts
is probably not completely broken (for one thing, I do it
myself sometimes). I'll do some testing to see what does
actually work now and then encode that in tests.

5 patches for repository darcs-unstable at darcs.net:screened:

patch b475daf7b08816e62399c6da81ecb5243d1676c0
Author: Ganesh Sittampalam <ganesh at earth.li>
Date:   Sat Sep 14 10:58:09 BST 2019
  * Use Prim patches in rebase suspended patches
  
  It doesn't make sense to support conflicted patches
  inside a rebase, as conflicts are more naturally
  expressed inside a rebase with fixups. Attempts to
  suspend conflicted patches don't work well anyway
  (see issue2634).
  
  This change is backwards compatible with the on-disk
  rebase format for unconflicted patches because each
  RepoPatch type just saves unconflicted patches without
  any wrapping.
  

patch 93428bf455c0915f5a4702f621cc53fcb19603db
Author: Ganesh Sittampalam <ganesh at earth.li>
Date:   Sat Sep 14 11:03:19 BST 2019
  * WIP: convert most Rebase types to have a prim parameter directly
  
  Types on the "boundary" are tricky. For now Suspended is changed
  but RebaseChanges and RebaseSelect are not. RebaseChanges is
  hardest because of the Summary instance, which intrinsically
  wants to know what the RepoPatch type is so it can build a
  Merge.
  

patch 4d7181a06ac474e74362b2a48a506991fa54b4d0
Author: Ganesh Sittampalam <ganesh at earth.li>
Date:   Sat Sep 14 11:12:38 BST 2019
  * parameterise RebaseSelect with Prim

patch 29440dfe49ca543575acc5af5dd2d5fca8f929b6
Author: Ganesh Sittampalam <ganesh at earth.li>
Date:   Sat Sep 14 11:13:14 BST 2019
  * parameterise RebaseChange over PrimOf

patch 6ae679a4ef497809978c47ac1673a1a028867410
Author: Ganesh Sittampalam <ganesh at earth.li>
Date:   Sat Sep 14 11:19:03 BST 2019
  * rename D.P.Rebase.Container to D.P.Rebase.Suspended
  
  The module primarily contains the Suspended type and code
  to manipulate it.

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/patch1911>
__________________________________
-------------- next part --------------
A non-text attachment was scrubbed...
Name: patch-preview.txt
Type: text/x-darcs-patch
Size: 47795 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20190914/5725e5c0/attachment-0002.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: use-prim-patches-in-rebase-suspended-patches.dpatch
Type: application/x-darcs-patch
Size: 53759 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20190914/5725e5c0/attachment-0003.bin>
-------------- next part --------------
.