.. Copyright 2011 Pierre-Yves David <pierre-yves.david@ens-lyon.org>

..                Logilab SA        <contact@logilab.fr>

========================================

Safe Mutable History

========================================

Here are various materials on planned improvement to Mercurial regarding

rewriting history.

solve them once and for all.

.. toctree::

   :maxdepth: 2

   instability

The effort is split in two parts:

 * The **obsolescence marker** concept aims to provide an alternative to ``strip``

   Mercurial 2.3.

   *marker* under the hood.

The first and most important step is by far the **obsolescence marker**. However

most users will never be directly exposed to the concept. For this reason

this manual starts with changeset evolution.

Evolve: A robust alternative to MQ

====================================

Evolve is an experimental history rewriting extension that uses obsolete

them:

* Focus on your current work.

    You can focus your work on a single changeset and take care of adapting

* Handle **non-linear history with branches and merges**

*  Mutable history **fully available all the time**.

  mutable part of your history.

  exchange real changesets. Mutable history can be used in all usual operations:

  pull, push, log, diff, etc.

  (thanks to obsolete marker).

.. warning:: The evolve extension and obsolete markers are at an experimental

             stage. While using obsolete you willl likely be exposed to complex

             implications of the **obsolete marker** concept. I do not recommend

             non-power users to test this at this stage.

             While numbered 1.0.0, the command line API of this version should

             repository corruption.

To enable the evolve extension use::

    $ hg clone https://bitbucket.org/marmoute/mutable-history -u stable

    $ echo '[extensions]\nevolve=$PWD/mutable-history/hgext/evolve.py' >> ~/.hgrc

You will probably want to use hgview_ to visualize obsolescence. Version 1.7.0

or later is required.

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

 ---

.. toctree::

   :maxdepth: 1

   tutorials/tutorial

   evolve-good-practice

   evolve-faq

   from-mq

   evolve-collaboration

   qsync

Smart changeset deletion: Obsolete Marker

==========================================

history rewriting operations. It is a new type of relation between Mercurial

 ---

.. toctree::

   :maxdepth: 1

   obs-concept

   obs-terms

   obs-implementation

=================================

  graft using `-O`.

  you to manually specify target all the time.

* Extinct changesets are hidden using the *hidden* feature of mercurial only

  supported by a few commands.