docs/glossary.rst
author Patrick Mezard <patrick@mezard.eu>
Thu, 21 Jun 2012 18:00:32 +0200
changeset 296 c3ff47e6bd36
parent 183 8907a9269549
child 357 b398e9c2dbd1
permissions -rw-r--r--
test-evolve: extend output and exhibit an amend bug The extended section shows the parent revision stabilizing itself on another revision, without --any. In theory, only descendants of the parent predecessors or of its descendants should be stabilized, and be stabilized in parent subtree. Unfortunately, stabilize implementation correctly picks the changesets to stabilize but not their target. This problem is aggravated by amend registering too many obsolete markers which prevents the stabilize selection heuristic to prune several changesets.

-----------------------------------------------------
Vocabulary
-----------------------------------------------------

.. note:: all terminology is subject to change

:obsolete marker:
    express a relation from 0..n new changesets to 1 old changeset
:obsolete changesets:
    non public changeset which are target of a obsolete marker

:unstable changeset:
    changeset not obsolete but with obsolete ancestor

:extinct changeset:
    obsolete changeset without unstable descendant

:suspended changeset:
    obsolete changeset with unstable descendant

:obsolete-parents:
    previous versions of a changeset, through a direct obsolete marker.

:obsolete-children:
    new versions of a changeset, through a direct obsolete marker.

:obsolete-ancestors:
    previous versions of a changeset, through any number of obsolete marker

:obsolete-descendant:
    new versions of a changeset, through any number of obsolete marker

:obsolete-diff:
    diff between a changeset and it's obsolete parent

:obsolete-tip:
    obsolete-descendants which are not obsolete themselves.

:conflicting changeset:
    multiple obsolete-tip for an obsolete changeset through diverging obsolete
    markers (no changeset split marker)