comparison docs/obs-terms.rst @ 1287:6f2c1574eda8 stable

docs: fix slightly unconventional .rst markup

1286:d6a77e8f7d5c

.. Copyright 2011 Pierre-Yves David <[e-mail]>
..                Logilab SA        <[e-mail]>

-----------------------------------------------------------
Terminology of the obsolete concept
-----------------------------------------------------------

Obsolete markers
---------------------------------

The mutable concept is based on **obsolete markers**. Creating an obsolete
marker registers a relation between an old obsoleted changeset and its newer
version.

.. note:: I'm not very happy with this naming scheme and I'm looking for a
          better distinction between *direct successors* and **any successors**.

Possible changesets "type"
---------------------------------

The following table describes names and behaviors of changesets affected by
obsolete markers. The left column describes generic categories and the right
columns are about sub-categories.

+------------------------------------------------------------------------------+



Command and operation name
---------------------------------


Existing terms
``````````````

:graft: to copy a changeset
:rebase: to move a changeset


Uncommit
`````````````

Remove files from a commit (and leave them as dirty in the working directory)

The *evolve* extension have an `uncommit` command that aims to replace most
`rollback` usage.

Fold
``````````

Collapse multiple changesets into a unique one.

The *evolve* extension will have a `fold` command.

Prune
``````````

Make a changeset obsolete without successors.

This an important operation as it should mostly replace *strip*.

- kill: shall has funny effects when you forget "hg" in front of ``hg kill``.
- obsolete: too vague, too long and too generic.

evolve
```````````````

Automatically resolve *troublesome* changesets
(*unstable*, *bumped* and *divergent*)

This is an important name as hg pull/push will suggest it the same way it

1287:6f2c1574eda8

.. Copyright 2011 Pierre-Yves David <[e-mail]>
..                Logilab SA        <[e-mail]>

-----------------------------------
Terminology of the obsolete concept
-----------------------------------

Obsolete markers
----------------

The mutable concept is based on **obsolete markers**. Creating an obsolete
marker registers a relation between an old obsoleted changeset and its newer
version.

.. note:: I'm not very happy with this naming scheme and I'm looking for a
          better distinction between *direct successors* and **any successors**.

Possible changesets "type"
--------------------------

The following table describes names and behaviors of changesets affected by
obsolete markers. The left column describes generic categories and the right
columns are about sub-categories.

+------------------------------------------------------------------------------+



Command and operation name
--------------------------


Existing terms
``````````````

:graft: to copy a changeset
:rebase: to move a changeset


Uncommit
````````

Remove files from a commit (and leave them as dirty in the working directory)

The *evolve* extension have an `uncommit` command that aims to replace most
`rollback` usage.

Fold
````

Collapse multiple changesets into a unique one.

The *evolve* extension will have a `fold` command.

Prune
`````

Make a changeset obsolete without successors.

This an important operation as it should mostly replace *strip*.

- kill: shall has funny effects when you forget "hg" in front of ``hg kill``.
- obsolete: too vague, too long and too generic.

evolve
``````

Automatically resolve *troublesome* changesets
(*unstable*, *bumped* and *divergent*)

This is an important name as hg pull/push will suggest it the same way it