[darcs-devel] [patch1948] v3: fix name of a local variable that di... (and 7 more)

Ganesh Sittampalam bugs at darcs.net
Tue Oct 8 05:39:51 UTC 2019


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

>   * v3: fix name of a local variable that didn't follow the convention

OK

>   * define swapCleanMerge and use it and swapMerge in RepoPatchV3

OK

>   * decouple ToPrim and FromPrim
>   
>   For compatibility we retain ToFromPrim as a constraint synonym.

OK (though I don't see much value in retaining ToFromPrim)

>   * refactor Conflictor/Conflictor case of RepoPatchV3 merge
>   
>   This just defines the components separately using let.

OK

>   * RepoPatchV3: simplify Conflictor/Conflictor case of cleanMerge

OK

>   * move conflict resolution for RepoPatchV3 to its own module

OK

>   * use RepoPatchV3 type synonym in instance definition

OK

>   * v3: extend invariant for Contexted patches inside a Conflictor

OK

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/patch1948>
__________________________________


More information about the darcs-devel mailing list