Mercurial Mercurial > pub > hg > evolve / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
161
4e3f25ba5401 More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset 
     1
 
-----------------------------------------------------
4e3f25ba5401 More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset 
     2
 
Vocabulary
4e3f25ba5401 More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset 
     3
 
-----------------------------------------------------
4e3f25ba5401 More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset 
     4
 












4e3f25ba5401
More doc and index with sphynx



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




     5


.. note:: all terminology is subject to change












4e3f25ba5401
More doc and index with sphynx



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




     6














4e3f25ba5401
More doc and index with sphynx



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




     7


:obsolete marker:












4e3f25ba5401
More doc and index with sphynx



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




     8


    express a relation from 0..n new changesets to 1 old changeset












4e3f25ba5401
More doc and index with sphynx



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




     9


:obsolete changesets:







183






8907a9269549
docs: polish for glossary



Arne Babenhauserheide <bab@draketo.de>


parents: 
161

diff
changeset




    10


    non public changeset which are target of a obsolete marker







161






4e3f25ba5401
More doc and index with sphynx



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    11














4e3f25ba5401
More doc and index with sphynx



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    12


:unstable changeset:












4e3f25ba5401
More doc and index with sphynx



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    13


    changeset not obsolete but with obsolete ancestor












4e3f25ba5401
More doc and index with sphynx



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    14














4e3f25ba5401
More doc and index with sphynx



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    15


:extinct changeset:












4e3f25ba5401
More doc and index with sphynx



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    16


    obsolete changeset without unstable descendant












4e3f25ba5401
More doc and index with sphynx



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    17














4e3f25ba5401
More doc and index with sphynx



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    18


:suspended changeset:












4e3f25ba5401
More doc and index with sphynx



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    19


    obsolete changeset with unstable descendant












4e3f25ba5401
More doc and index with sphynx



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    20














4e3f25ba5401
More doc and index with sphynx



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    21


:obsolete-parents:












4e3f25ba5401
More doc and index with sphynx



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    22


    previous versions of a changeset, through a direct obsolete marker.












4e3f25ba5401
More doc and index with sphynx



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    23














4e3f25ba5401
More doc and index with sphynx



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    24


:obsolete-children:












4e3f25ba5401
More doc and index with sphynx



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    25


    new versions of a changeset, through a direct obsolete marker.












4e3f25ba5401
More doc and index with sphynx



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    26














4e3f25ba5401
More doc and index with sphynx



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    27


:obsolete-ancestors:












4e3f25ba5401
More doc and index with sphynx



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    28


    previous versions of a changeset, through any number of obsolete marker












4e3f25ba5401
More doc and index with sphynx



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    29














4e3f25ba5401
More doc and index with sphynx



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    30


:obsolete-descendant:












4e3f25ba5401
More doc and index with sphynx



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    31


    new versions of a changeset, through any number of obsolete marker












4e3f25ba5401
More doc and index with sphynx



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    32














4e3f25ba5401
More doc and index with sphynx



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    33


:obsolete-diff:












4e3f25ba5401
More doc and index with sphynx



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    34


    diff between a changeset and it's obsolete parent












4e3f25ba5401
More doc and index with sphynx



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    35














4e3f25ba5401
More doc and index with sphynx



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    36


:obsolete-tip:







183






8907a9269549
docs: polish for glossary



Arne Babenhauserheide <bab@draketo.de>


parents: 
161

diff
changeset




    37


    obsolete-descendants which are not obsolete themselves.







161






4e3f25ba5401
More doc and index with sphynx



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    38














4e3f25ba5401
More doc and index with sphynx



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    39


:conflicting changeset:












4e3f25ba5401
More doc and index with sphynx



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    40


    multiple obsolete-tip for an obsolete changeset through diverging obsolete







183






8907a9269549
docs: polish for glossary



Arne Babenhauserheide <bab@draketo.de>


parents: 
161

diff
changeset




    41


    markers (no changeset split marker)














evolve