Pulkit Goyal <7895pulkit@gmail.com> [Mon, 22 Jan 2018 17:44:57 +0530] rev 3478
evolvecmd: pass evolvestate object to _solve* functions
This patchs adds an argument evolvestate to _solve* functions. This will help us
in having one evolvestate object which we can pass around various functions and
keep storing what's going on.
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 22 Jan 2018 17:29:56 +0530] rev 3477
evolve: create a state object in all case
Let's create a state object even when we are not in the continue mode. This will
help us passing the state object to rest of the functions.
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 04 Feb 2018 14:29:18 +0100] rev 3476
branching: merge with stable
Pulkit Goyal <7895pulkit@gmail.com> [Fri, 02 Feb 2018 13:59:33 +0530] rev 3475
grab: preserve phase of the grabbed changeset
This patch fixes the wrong behavior of loosing secret phase of the grabbed
changeset.
Pulkit Goyal <7895pulkit@gmail.com> [Fri, 02 Feb 2018 13:45:47 +0530] rev 3474
tests: add a test showing grabbing of secret changeset turn it into draft
This patch adds a test showing wrong behavior of `hg grab` command which looses
the secret phase while grabbing a secret changeset.
Pulkit Goyal <7895pulkit@gmail.com> [Fri, 02 Feb 2018 15:37:00 +0530] rev 3473
grab: add grab info to cmdutil.afterresolvedstates
This will help us in showing how to continue the grab when user resolves all the
conflicts.