Mercurial > hg
comparison tests/test-rebase-obsolete.t @ 33667:03039ff3082b
evolution: rename unstable to orphan
Rename unstable to orphan in all external user-facing output. Only update
user-facing output for the moment, variables names, templates keyword and
potentially configuration would be done in later series.
The renaming is done according to
https://www.mercurial-scm.org/wiki/CEDVocabulary.
Differential Revision: https://phab.mercurial-scm.org/D214
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Tue, 01 Aug 2017 17:53:48 +0200 |
parents | b11e8c67fb0f |
children | 644dddccc265 |
comparison
equal
deleted
inserted
replaced
33666:6f4bc9688ca9 | 33667:03039ff3082b |
---|---|
791 o 2:261e70097290 B2 | 791 o 2:261e70097290 B2 |
792 | | 792 | |
793 o 0:4a2df7238c3b A | 793 o 0:4a2df7238c3b A |
794 | 794 |
795 $ hg summary | 795 $ hg summary |
796 parent: 15:73568ab6879d tip (unstable) | 796 parent: 15:73568ab6879d tip (orphan) |
797 bar foo | 797 bar foo |
798 branch: default | 798 branch: default |
799 commit: (clean) | 799 commit: (clean) |
800 update: 2 new changesets, 3 branch heads (merge) | 800 update: 2 new changesets, 3 branch heads (merge) |
801 phases: 8 draft | 801 phases: 8 draft |
802 unstable: 1 changesets | 802 orphan: 1 changesets |
803 $ hg rebase -s 10 -d 12 | 803 $ hg rebase -s 10 -d 12 |
804 abort: this rebase will cause divergences from: 121d9e3bc4c6 | 804 abort: this rebase will cause divergences from: 121d9e3bc4c6 |
805 (to force the rebase please set experimental.allowdivergence=True) | 805 (to force the rebase please set experimental.allowdivergence=True) |
806 [255] | 806 [255] |
807 $ hg log -G | 807 $ hg log -G |