| author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
| Tue, 20 Mar 2012 15:10:53 +0100 | |
| changeset 150 | f12fd2410a60 |
| parent 149 | 03f314e32058 |
| permissions | -rw-r--r-- |
|
149
03f314e32058
import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
1 |
|
|
03f314e32058
import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
2 |
----------------------------------------------------- |
|
03f314e32058
import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
3 |
Vocabulary |
|
03f314e32058
import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
4 |
----------------------------------------------------- |
|
03f314e32058
import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
5 |
|
|
03f314e32058
import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
6 |
.. note:: all terminology is subject to change |
|
03f314e32058
import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
7 |
|
|
03f314e32058
import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
8 |
:obsolete marker: |
|
03f314e32058
import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
9 |
express a relation from 0..n new changesets to 1 old changeset |
|
03f314e32058
import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
10 |
:obsolete changesets: |
|
03f314e32058
import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
11 |
non public changeset target of a obsolete marker |
|
03f314e32058
import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
12 |
|
|
03f314e32058
import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
13 |
:unstable changeset: |
|
03f314e32058
import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
14 |
changeset not obsolete but with obsolete ancestor |
|
03f314e32058
import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
15 |
|
|
03f314e32058
import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
16 |
:extinct changeset: |
|
03f314e32058
import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
17 |
obsolete changeset without unstable descendant |
|
03f314e32058
import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
18 |
|
|
03f314e32058
import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
19 |
:suspended changeset: |
|
03f314e32058
import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
20 |
obsolete changeset with unstable descendant |
|
03f314e32058
import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
21 |
|
|
03f314e32058
import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
22 |
:obsolete-parents: |
|
03f314e32058
import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
23 |
previous versions of a changeset, through a direct obsolete marker. |
|
03f314e32058
import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
24 |
|
|
03f314e32058
import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
25 |
:obsolete-children: |
|
03f314e32058
import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
26 |
new versions of a changeset, through a direct obsolete marker. |
|
03f314e32058
import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
27 |
|
|
03f314e32058
import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
28 |
:obsolete-ancestors: |
|
03f314e32058
import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
29 |
previous versions of a changeset, through any number of obsolete marker |
|
03f314e32058
import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
30 |
|
|
03f314e32058
import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
31 |
:obsolete-descendant: |
|
03f314e32058
import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
32 |
new versions of a changeset, through any number of obsolete marker |
|
03f314e32058
import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
33 |
|
|
03f314e32058
import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
34 |
:obsolete-diff: |
|
03f314e32058
import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
35 |
diff between a changeset and it's obsolete parent |
|
03f314e32058
import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
36 |
|
|
03f314e32058
import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
37 |
:obsolete-tip: |
|
03f314e32058
import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
38 |
obsolete-descendants not obsolete themself. |
|
03f314e32058
import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
39 |
|
|
03f314e32058
import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
40 |
:conflicting changeset: |
|
03f314e32058
import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
41 |
multiple obsolete-tip for an obsolete changeset through diverging obsolete |
|
03f314e32058
import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
42 |
marker (no changeset split marker) |