Mercurial > evolve

comparison docs/glossary.rst @ 161:4e3f25ba5401

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More doc and index with sphynx
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Tue, 20 Mar 2012 19:26:55 +0100
parents
children 8907a9269549
comparison
equal deleted inserted replaced
160:24346b78cd99 161:4e3f25ba5401
1 -----------------------------------------------------
2 Vocabulary
3 -----------------------------------------------------
4
5 .. note:: all terminology is subject to change
6
7 :obsolete marker:
8 express a relation from 0..n new changesets to 1 old changeset
9 :obsolete changesets:
10 non public changeset target of a obsolete marker
11
12 :unstable changeset:
13 changeset not obsolete but with obsolete ancestor
14
15 :extinct changeset:
16 obsolete changeset without unstable descendant
17
18 :suspended changeset:
19 obsolete changeset with unstable descendant
20
21 :obsolete-parents:
22 previous versions of a changeset, through a direct obsolete marker.
23
24 :obsolete-children:
25 new versions of a changeset, through a direct obsolete marker.
26
27 :obsolete-ancestors:
28 previous versions of a changeset, through any number of obsolete marker
29
30 :obsolete-descendant:
31 new versions of a changeset, through any number of obsolete marker
32
33 :obsolete-diff:
34 diff between a changeset and it's obsolete parent
35
36 :obsolete-tip:
37 obsolete-descendants not obsolete themself.
38
39 :conflicting changeset:
40 multiple obsolete-tip for an obsolete changeset through diverging obsolete
41 marker (no changeset split marker)