Mercurial > evolve
diff tests/test-topic-stack.t @ 3431:2e703ed1c713
evolve: update output for wider reporting of troubled changesets
CORE-TEST-OUTPUT-UPDATE: 1a09dad8b85a
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Sat, 13 Jan 2018 14:35:49 -0800 |
parents | d3a17c67f85c |
children | 2823c82ad8a4 |
line wrap: on
line diff
--- a/tests/test-topic-stack.t Fri Jan 19 19:18:05 2018 +0100 +++ b/tests/test-topic-stack.t Sat Jan 13 14:35:49 2018 -0800 @@ -262,6 +262,7 @@ $ echo bbb > ddd $ hg commit --amend + 2 new orphan changesets $ hg log -G @ 6 default {foo} draft c_d | @@ -396,6 +397,7 @@ 0 files updated, 0 files merged, 2 files removed, 0 files unresolved $ echo ccc > ddd $ hg commit --amend -m 'c_D' + 4 new orphan changesets $ hg rebase -d . -s 'desc(c_g)' rebasing 9:81264ae8a36a "c_g" (foo) rebasing 10:fde5f5941642 "c_h" (foo) @@ -486,6 +488,7 @@ Changing topics on some commits in between $ hg topic foobar -r 'desc(c_e) + desc(c_D)' switching to topic foobar + 4 new orphan changesets changed topic on 2 changes $ hg log -G @ 17 default {foobar} draft c_D @@ -511,6 +514,7 @@ $ hg rebase -s 'desc("c_f") - obsolete()' -d 'desc("c_e") - obsolete()' rebasing 15:77082e55de88 "c_f" (foo) switching to topic foo + 1 new orphan changesets switching to topic foobar $ hg rebase -s 'desc("c_g") - obsolete()' -d 'desc("c_D") - obsolete()' rebasing 12:0c3e8aed985d "c_g" (foo) @@ -662,6 +666,7 @@ switching to topic red 0 files updated, 0 files merged, 6 files removed, 0 files unresolved $ hg commit --amend --user test2 + 7 new orphan changesets $ hg up 'desc("c_C")' 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg commit --amend --user test2 @@ -822,6 +827,7 @@ $ echo zzz > Z $ hg add Z $ hg commit --amend + 1 new orphan changesets $ hg status --change . A Z A ggg