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

Ganesh Sittampalam bugs at darcs.net
Sat Sep 14 16:18:45 UTC 2019


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

latest version of the Prim migration for Rebase.

But patch1915 shows that it does actually cause a
regression, without a solution for suspending conflicted
patches into fixups directly.

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

patch db927933af5a3755e956fb0b9e8602e57173c5f4
Author: Ganesh Sittampalam <ganesh at earth.li>
Date:   Sat Sep 14 17:10:30 BST 2019
  * WIP: Use Prim patches in rebase suspended patches
  
  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.
  
  However it breaks the existing cases where suspending
  a conflicted patch does work (as well as reading those
  cases from disk.)

patch e64abfd8f9e33ab9ce8cfb6732289f67c5cfcd6e
Author: Ganesh Sittampalam <ganesh at earth.li>
Date:   Sat Sep 14 17:11:38 BST 2019
  * WIP: convert Rebase types to have a prim parameter directly

__________________________________
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: 42581 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20190914/cbcac5f2/attachment-0002.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: wip_-use-prim-patches-in-rebase-suspended-patches.dpatch
Type: application/x-darcs-patch
Size: 48783 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20190914/cbcac5f2/attachment-0003.bin>
-------------- next part --------------
.





More information about the darcs-devel mailing list