doc/vocabulary.rst
changeset 149 03f314e32058
equal deleted inserted replaced
148:8e93e1f67205 149:03f314e32058
       
     1 
       
     2 -----------------------------------------------------
       
     3 Vocabulary
       
     4 -----------------------------------------------------
       
     5 
       
     6 .. note:: all terminology is subject to change
       
     7 
       
     8 :obsolete marker:
       
     9     express a relation from 0..n new changesets to 1 old changeset
       
    10 :obsolete changesets:
       
    11     non public changeset target of a obsolete marker
       
    12 
       
    13 :unstable changeset:
       
    14     changeset not obsolete but with obsolete ancestor
       
    15 
       
    16 :extinct changeset:
       
    17     obsolete changeset without unstable descendant
       
    18 
       
    19 :suspended changeset:
       
    20     obsolete changeset with unstable descendant
       
    21 
       
    22 :obsolete-parents:
       
    23     previous versions of a changeset, through a direct obsolete marker.
       
    24 
       
    25 :obsolete-children:
       
    26     new versions of a changeset, through a direct obsolete marker.
       
    27 
       
    28 :obsolete-ancestors:
       
    29     previous versions of a changeset, through any number of obsolete marker
       
    30 
       
    31 :obsolete-descendant:
       
    32     new versions of a changeset, through any number of obsolete marker
       
    33 
       
    34 :obsolete-diff:
       
    35     diff between a changeset and it's obsolete parent
       
    36 
       
    37 :obsolete-tip:
       
    38     obsolete-descendants not obsolete themself.
       
    39 
       
    40 :conflicting changeset:
       
    41     multiple obsolete-tip for an obsolete changeset through diverging obsolete
       
    42     marker (no changeset split marker)