comparison docs/evolve-faq.rst @ 500:4387e62bd4f4 stable

Doc: several update

499:a9c27df23129

changeset combining working-directory parent changes and parent. It
will work on any `draft` or `secret` changeset. It will not work on
`public` changesets.

To understand what the result of amend will be I use the two following
aliases  [#]_::

    # diff what amend will look likes
    pdiff=diff --rev .^

    # status what amend will look likes

          on the command line.

          XXX add idank example


.. [#] (added by enable.sh)



Move a changeset: ``graft``
------------------------------------------------------------

directory parent commit.

.. note:: those command only exist for the convenience of getting qpush and qpop
          feeling back.

Collapse changesets: ``amend``
------------------------------------------------------------

you can use amend -c to collapse multiple changeset in a single one.

Getting changes out of a commit
------------------------------------------------------------

The ``hg uncommit`` command lets you rewrite the parent commit without

You can still use rebase to move a whole segment of the changeset graph together.

.. warning:: Beware that rebasing obsolete changesets will result in
             conflicting versions of the changesets.

Stabilize history: ``evolve``
------------------------------------------------------------

When you rewrite (amend) a changeset with children without rewriting
those children you create *unstable* changesets and *suspended
obsolete* changesets.

    odiff = diff --rev 'limit(precursors(.),1)' --rev .

View obsolete markers
------------------------------------------------------------

hgview is the only viewer that support this feature. You need an experimental
version available here:

    $ hg clone http://hg-dev.octopoid.net/hgwebdir.cgi/hgview/

You can also use a debug command

    $ hg debugobsolete
      5eb72dbe0cb4 e8db4aa611f6

500:4387e62bd4f4

changeset combining working-directory parent changes and parent. It
will work on any `draft` or `secret` changeset. It will not work on
`public` changesets.

To understand what the result of amend will be I use the two following
aliases   [#]_::

    # diff what amend will look likes
    pdiff=diff --rev .^

    # status what amend will look likes

          on the command line.

          XXX add idank example


.. [#] (defined by the evolve extension for you)



Move a changeset: ``graft``
------------------------------------------------------------

directory parent commit.

.. note:: those command only exist for the convenience of getting qpush and qpop
          feeling back.

Collapse changesets: ``fold``
------------------------------------------------------------

you can use ``hg fold`` to collapse multiple changeset in a single one.

Getting changes out of a commit
------------------------------------------------------------

The ``hg uncommit`` command lets you rewrite the parent commit without

You can still use rebase to move a whole segment of the changeset graph together.

.. warning:: Beware that rebasing obsolete changesets will result in
             conflicting versions of the changesets.

Resolve history troubles: ``evolve``
------------------------------------------------------------

When you rewrite (amend) a changeset with children without rewriting
those children you create *unstable* changesets and *suspended
obsolete* changesets.

    odiff = diff --rev 'limit(precursors(.),1)' --rev .

View obsolete markers
------------------------------------------------------------

hgview_ is the only viewer that currently support this feature. You need version 1.6.2

.. _hgview: http://www.logilab.org/project/hgview/

.. image:: figures/hgview-example.png
    :scale: 50%


You can also use a debug command

    $ hg debugobsolete
      5eb72dbe0cb4 e8db4aa611f6