[darcs-devel] [patch2003] use unwind in rebase suspend

Ganesh Sittampalam bugs at darcs.net
Sun Feb 23 22:20:11 UTC 2020


New submission from Ganesh Sittampalam <ganesh at earth.li>:

The final patch in this bundle, building on patch1979, patch2001
and patch2002, shows that we can now suspend conflicts correctly
with unwind.

I don't want to screen this yet as it doesn't yet deal with
failed unwinds (albeit that they should be very rare).

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

patch b043d8bcbbe106224a90148480f9735ab0bfefc3
Author: Ganesh Sittampalam <ganesh at earth.li>
Date:   Sun Feb 23 10:58:34 GMT 2020
  * tests: always use prim patches for generating/shrinking
  
  We already didn't try to generate conflicted patches, and
  even shrinking unconflicted patches is actually unsound if
  there might be a conflict later in a sequence.
  
  Instead of needing partial functions on repo patches, it's
  better to express this invariant in the types by only storing
  prim patches, and generating the repo patches on the fly
  when actually using the test cases.
  

patch ba02c674facfc9dfc826adc1eb8509e07fe010c0
Author: Ganesh Sittampalam <ganesh at earth.li>
Date:   Sun Feb 23 12:06:59 GMT 2020
  * tests: introduce infrastructure for merge checking
  
  Because V1 and V2 patches are known to be buggy, we
  sometimes need to exclude buggy merges when using them
  to test other properties.

patch b55922b9b19e27d3d42cf4c500d2c9e17e24e9d5
Author: Ganesh Sittampalam <ganesh at earth.li>
Date:   Sun Feb 23 18:44:20 GMT 2020
  * tests: export V1Model(..)

patch 3dc6fb02adcabbba69bc02decb322fec09bab80a
Author: Ganesh Sittampalam <ganesh at earth.li>
Date:   Sun Feb 23 18:48:06 GMT 2020
  * tests: move patch properties into D.T.P.P.Generic
  
  This means they can be used from D.T.P.RepoPatchV1
  

patch 6f7b4b6bd8785c0f4df3bf587c1ac1df1149d576
Author: Ganesh Sittampalam <ganesh at earth.li>
Date:   Sun Feb 23 18:51:48 GMT 2020
  * tests: remove unused withStateShrinking

patch 4b0e6e70e1c73391b5ad787c88b47cf330ff6a29
Author: Ganesh Sittampalam <ganesh at earth.li>
Date:   Sun Feb 23 18:52:48 GMT 2020
  * tests: generalise hasPrimConstruct, add usesV1Model

patch c26d508c17fc6157325cea574118adace10ba083
Author: Ganesh Sittampalam <ganesh at earth.li>
Date:   Sun Feb 23 18:52:54 GMT 2020
  * tests: introduce method to identify V1 patch type

patch fa5773462abc1d2d4fc79429f43afe62574910e2
Author: Ganesh Sittampalam <ganesh at earth.li>
Date:   Sun Feb 23 18:54:42 GMT 2020
  * tests: add withAllSequenceItems

patch ed48a37300e45d31ff9b98389340e59b20f8d725
Author: Ganesh Sittampalam <ganesh at earth.li>
Date:   Sun Feb 23 18:57:30 GMT 2020
  * introduce concept of unwinding a conflict
  
  This provides a generic way to get at the underlying primitive
  patches in the conflict.

patch 2efa4a004c8edd7c49757de7a2f5ab6313f928d6
Author: Ganesh Sittampalam <ganesh at earth.li>
Date:   Sun Feb 23 22:15:09 GMT 2020
  * resolve issue2634: use unwind to suspend patches

----------
files: patch-preview.txt, tests_-always-use-prim-patches-for-generating_shrinking.dpatch, unnamed
messages: 21894
nosy: ganesh
status: needs-screening
title: use unwind in rebase suspend

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/patch2003>
__________________________________
-------------- next part --------------
A non-text attachment was scrubbed...
Name: patch-preview.txt
Type: text/x-darcs-patch
Size: 58875 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20200223/b7ae7d3c/attachment-0002.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: tests_-always-use-prim-patches-for-generating_shrinking.dpatch
Type: application/x-darcs-patch
Size: 83490 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20200223/b7ae7d3c/attachment-0003.bin>
-------------- next part --------------
.





More information about the darcs-devel mailing list