Mercurial > evolve
view docs/commands.rst @ 3827:82c72eb37f85
evolve: strip the relocation commit on `hg evolve --stop`
While resolving content-divergence on multiple parents, we relocate one of the
commit on the parent of another one and then merge the divergent changesets.
Merging can leads to conflicts, and if user does `hg evolve --stop`, we need to
strip that relocated changeset too! This patch does that.
Test changes demonstrates the fix.
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Mon, 11 Jun 2018 00:47:28 +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