Mercurial > evolve
diff tests/test-evolve.t @ 2854:66796d7b5415
warning: rename unstable warning message
unstable has been renamed into orphan. Update the warning message when new
orphan changesets are detected.
Renaming done according to
https://www.mercurial-scm.org/wiki/CEDVocabulary
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Thu, 24 Aug 2017 09:11:06 +0200 |
parents | 9688988472da |
children | 1db0137297f4 |
line wrap: on
line diff
--- a/tests/test-evolve.t Wed Aug 23 23:44:36 2017 +0200 +++ b/tests/test-evolve.t Thu Aug 24 09:11:06 2017 +0200 @@ -344,7 +344,7 @@ (amend of on ancestors) $ hg amend - 1 new unstable changesets + 1 new orphan changesets $ hg log 6 feature-A: a nifty feature - test 4 feature-B: another feature (child of 568a468b60fc) - test @@ -446,7 +446,7 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ sed -i'' -e s/Un/Én/ main-file-1 $ hg commit --amend -m 'dansk!' - 2 new unstable changesets + 2 new orphan changesets (ninja test for the {trouble} template: @@ -831,7 +831,7 @@ $ hg ci -m c $ hg prune .^ 1 changesets pruned - 1 new unstable changesets + 1 new orphan changesets $ hg stab --any move:[15] c atop:[13] a @@ -908,7 +908,7 @@ marked working directory as branch mybranch (branches are permanent and global, did you want a bookmark?) $ hg amend - 1 new unstable changesets + 1 new orphan changesets $ hg evolve move:[3] a3 @@ -930,7 +930,7 @@ $ hg up 'desc(a1)' 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg amend -m 'a1_' - 2 new unstable changesets + 2 new orphan changesets $ hg evolve move:[5] a2 atop:[7] a1_ @@ -954,7 +954,7 @@ $ hg up 7 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg ci --amend -m 'a1__' - 2 new unstable changesets + 2 new orphan changesets $ hg up 8 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -1086,7 +1086,7 @@ o 0 : a0 - test $ hg amend - 2 new unstable changesets + 2 new orphan changesets $ hg log -G @ 18 : a3 - test | @@ -1247,7 +1247,7 @@ $ echo "hello" > j4 $ hg add j4 $ hg amend - 2 new unstable changesets + 2 new orphan changesets $ glog -r "18::" @ 25:8dc373be86d9@default(draft) add j1 | @@ -1419,7 +1419,7 @@ $ hg commit -m "_pp" $ hg prune --succ "desc(_oo) + desc(_pp)" -r "desc('oo+pp')" --split 1 changesets pruned - 1 new unstable changesets + 1 new orphan changesets $ glog -r "18::" @ 35:7a555adf2b4a@default(draft) _pp | @@ -1463,7 +1463,7 @@ $ hg update -q 37 $ echo "amended" > newfile $ hg amend -m "amended" - 2 new unstable changesets + 2 new orphan changesets $ hg evolve --rev "37::" move:[38] will be evolved safely