comparison docs/sharing.rst @ 4618:803d32f4e498

docs: change `unstable` references to `orphan` Per https://www.mercurial-scm.org/wiki/CEDVocabulary
author Matt Harbison <matt_harbison@yahoo.com>
date Sat, 27 Apr 2019 21:24:18 -0400
parents 2cab06f5c4d4
children 93514c421528
comparison
equal deleted inserted replaced
4617:2cab06f5c4d4 4618:803d32f4e498
506 Mercurial with ``evolve`` is a powerful tool, and using powerful tools 506 Mercurial with ``evolve`` is a powerful tool, and using powerful tools
507 can have consequences. (You can cut yourself badly with a sharp knife, 507 can have consequences. (You can cut yourself badly with a sharp knife,
508 but every competent chef keeps several around. Ever try to chop onions 508 but every competent chef keeps several around. Ever try to chop onions
509 with a spoon?) 509 with a spoon?)
510 510
511 In the user guide, we saw examples of *unstable* changesets, which are 511 In the user guide, we saw examples of *orphan* changesets, which are
512 the most common type of troubled changeset. (Recall that a 512 the most common type of troubled changeset. (Recall that a
513 non-obsolete changeset with obsolete ancestors is an orphan.) 513 non-obsolete changeset with obsolete ancestors is an orphan.)
514 514
515 Two other types of instability can happen: *divergent* and 515 Two other types of instability can happen: *divergent* and
516 *bumped* changesets. Both are more likely with shared mutable 516 *bumped* changesets. Both are more likely with shared mutable