Mercurial > evolve
view docs/commands.rst @ 3848:90f1a64875ad
evolve: introduce a resolutionparent variable and store it in evolvestate
This patch introduces a resolutionparent variable which will be the parent of
final changeset after resolving content-divergent changesets.
Till now, the parent is always the parent of one of the divergent node, but now
in upcoming cases, it can be a successor of both the parents of divergent nodes.
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Thu, 14 Jun 2018 01:06:12 +0530 |
| parents | 3f466d348047 |
| children |
line wrap: on
line source
------------------------- Evolve Commands Reference ------------------------- .. highlight:: none amend ----- .. hghelp:: amend evolve ------ .. hghelp:: evolve fold ---- .. hghelp:: fold metaedit -------- .. hghelp:: metaedit next ---- .. hghelp:: next obslog ------ .. hghelp:: obslog pdiff ----- .. hghelp:: pdiff previous -------- .. hghelp:: previous prune ----- .. hghelp:: prune pstatus ------- .. hghelp:: pstatus split ----- .. hghelp:: split touch ----- .. hghelp:: touch uncommit -------- .. hghelp:: uncommit