Mercurial > evolve

comparison tests/test-evolve.t @ 3593:b92114f201c9 mercurial-4.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.2 into mercurial-4.1
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 21 Mar 2018 16:35:18 +0100
parents b21a3753255f 7a5c3175015e
children
comparison
equal deleted inserted replaced
3592:7a5c3175015e 3593:b92114f201c9
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: