equal
deleted
inserted
replaced
18 The *obsolete* relation act as a **perpendicular history** to the standard |
18 The *obsolete* relation act as a **perpendicular history** to the standard |
19 changeset history. Standard changeset history versions files. The *obsolete* |
19 changeset history. Standard changeset history versions files. The *obsolete* |
20 relation versions changesets. |
20 relation versions changesets. |
21 |
21 |
22 :obsolete: a changeset that have been replace by another one. |
22 :obsolete: a changeset that have been replace by another one. |
23 :out of sync: a non-obsolet changeset based on another one. |
23 :unstable: a non-obsolet changeset based on another one. |
24 :suspended: an obsolete changeset with out of sync descendant. |
24 :suspended: an obsolete changeset with unstable descendant. |
|
25 |
|
26 Another name for unstable could be out of sync. |
25 |
27 |
26 |
28 |
27 |
29 |
28 Usage and Feature |
30 Usage and Feature |
29 ================= |
31 ================= |
65 |
67 |
66 * handle split |
68 * handle split |
67 |
69 |
68 * handle conflict |
70 * handle conflict |
69 |
71 |
70 * handle out of sync |
72 * handle unstable // out of sync |
71 |
73 |
72 """ |
74 """ |
73 import os |
75 import os |
74 try: |
76 try: |
75 from cStringIO import StringIO |
77 from cStringIO import StringIO |