--- a/docs/obs-terms.rst Thu Apr 23 09:03:08 2015 -0400
+++ b/docs/obs-terms.rst Thu Apr 23 21:05:54 2015 -0400
@@ -1,12 +1,12 @@
.. Copyright 2011 Pierre-Yves David <pierre-yves.david@ens-lyon.org>
.. Logilab SA <contact@logilab.fr>
------------------------------------------------------------
+-----------------------------------
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
@@ -54,7 +54,7 @@
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
@@ -182,7 +182,7 @@
Command and operation name
----------------------------------
+--------------------------
Existing terms
@@ -196,7 +196,7 @@
Uncommit
-`````````````
+````````
Remove files from a commit (and leave them as dirty in the working directory)
@@ -204,14 +204,14 @@
`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.
@@ -223,7 +223,7 @@
- obsolete: too vague, too long and too generic.
evolve
-```````````````
+``````
Automatically resolve *troublesome* changesets
(*unstable*, *bumped* and *divergent*)