Mercurial > hg
diff 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 |
line wrap: on
line diff
--- a/tests/test-rebase-obsolete.t Tue Aug 01 17:39:28 2017 +0200 +++ b/tests/test-rebase-obsolete.t Tue Aug 01 17:53:48 2017 +0200 @@ -793,13 +793,13 @@ o 0:4a2df7238c3b A $ hg summary - parent: 15:73568ab6879d tip (unstable) + parent: 15:73568ab6879d tip (orphan) bar foo branch: default commit: (clean) update: 2 new changesets, 3 branch heads (merge) phases: 8 draft - unstable: 1 changesets + orphan: 1 changesets $ hg rebase -s 10 -d 12 abort: this rebase will cause divergences from: 121d9e3bc4c6 (to force the rebase please set experimental.allowdivergence=True)