Mercurial > evolve

view docs/commands.rst @ 3623:71fbb679e311

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: use the new rebased changeset to resolve phase-divergence When there is a parent change in phase-divergence, `hg evolve` first rebases the diveregent changeset on parent of public changeset and then continue the resolution of phase-divergence *but* we used to continue with the old divergent changeset rather than the new rebased one. This patch makes sure we use the new rebased changeset to proceed with the resolution. Tests changes shows that it fixes things which were broken earlier.
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 23 Mar 2018 17:46:46 +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