[darcs-devel] [patch1902] add failing test for rebase of conflicted patches

[Ganesh Sittampalam]

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

I managed to reduce things back to a single ToEdit per suspended patch,
at least for the examples in your test case.

I'm deliberately sending to this patch (and then marking dead) because
it relates to experimenting with your test case/trying to solve the
specific problem with suspending conflicts.

But I can do it to patch1911 or a new one if you prefer.

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

patch 7610904aa6588a30d42e43d531162b7843fb0fff
Author: Ganesh Sittampalam <ganesh at earth.li>
Date:   Tue Sep  3 17:05:38 BST 2019
  * WIP: use Prim patches in rebase toedit

patch b333381d224ff0b7edaaddc4da144606d80b3855
Author: Ganesh Sittampalam <ganesh at earth.li>
Date:   Tue Sep  3 23:00:35 BST 2019
  * HACK: unwind conflicts before suspending
  
  This really isn't the right solution because of the way it
  constructs multiple ToEdits from a single suspended patch.
  

patch 4af544fbbaa64e1a286c61c7abe0193ceab49936
Author: Ganesh Sittampalam <ganesh at earth.li>
Date:   Tue Sep  3 23:23:07 BST 2019
  * return FL from unwind

patch b887a13b8240403d67428800582e8ff3fd0c819a
Author: Ganesh Sittampalam <ganesh at earth.li>
Date:   Tue Sep  3 23:53:10 BST 2019
  * squash unwindings

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/patch1902>
__________________________________
-------------- next part --------------
A non-text attachment was scrubbed...
Name: patch-preview.txt
Type: text/x-darcs-patch
Size: 20245 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20190903/e15b8937/attachment-0002.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: wip_-use-prim-patches-in-rebase-toedit.dpatch
Type: application/x-darcs-patch
Size: 24714 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20190903/e15b8937/attachment-0003.bin>
-------------- next part --------------
.