equal
deleted
inserted
replaced
90 There are two main kinds of instability: orphaning and diverging. |
90 There are two main kinds of instability: orphaning and diverging. |
91 |
91 |
92 Orphans are changesets left behind when their ancestors are rewritten, |
92 Orphans are changesets left behind when their ancestors are rewritten, |
93 (currently: 'unstable'). Divergence has two variants: |
93 (currently: 'unstable'). Divergence has two variants: |
94 |
94 |
95 * Content-divergence occurs when independent rewrites of the same |
95 * Content-divergence occurs when independent rewrites of the same changesets |
96 changesets lead to different results. (currently: 'divergent') |
96 lead to different results. (currently: 'divergent') |
|
97 |
97 * Phase-divergence occurs when the old (obsolete) version of a changeset |
98 * Phase-divergence occurs when the old (obsolete) version of a changeset |
98 becomes public. (currently: 'bumped') |
99 becomes public. (currently: 'bumped') |
99 |
100 |
100 If it possible to prevent local creation of orphans by using the following |
101 If it possible to prevent local creation of orphans by using the following |
101 config: |
102 config: |