[PATCH FOLLOWUP] mergestate: define NO_OP_ACTION in module scope instead of inside mergeresult

Yuya Nishihara yuya at tcha.org
Sat Sep 19 02:39:50 UTC 2020


On Fri, 18 Sep 2020 16:52:54 +0530, Pulkit Goyal wrote:
> # HG changeset patch
> # User Pulkit Goyal <7895pulkit at gmail.com>
> # Date 1600259972 -19800
> #      Wed Sep 16 18:09:32 2020 +0530
> # Node ID dfb65ba955b4fddf86dd79cf8263989eb905ee3d
> # Parent  bf0ed472c2b88c2fdf60a8c3c4aa3cd58a3a258c
> # EXP-Topic merge-newnode
> mergestate: define NO_OP_ACTION in module scope instead of inside mergeresult

> -    NO_OP_ACTIONS = (
> -        mergestatemod.ACTION_KEEP,
> -        mergestatemod.ACTION_KEEP_ABSENT,
> -        mergestatemod.ACTION_KEEP_NEW,
> -    )

Can't apply. Maybe some intermediate patches would be missing.



More information about the Mercurial-devel mailing list