evolve: comparison tests/test-topic-stack.t

equal deleted inserted replaced

-:6be09fb2c08c
+:04aeaec6ec07
 Case with some of the topic unstable
 ------------------------------------
 $ echo bbb > ddd
 $ hg commit --amend
-2 new orphan changesets
 $ hg log -G
 @  6 default {foo} draft c_d
 |
-| *  5 default {foo} draft c_f
+| o  5 default {foo} draft c_f
 | |
-| *  4 default {foo} draft c_e
+| o  4 default {foo} draft c_e
 | |
 | x  3 default {foo} draft c_d
 |/
 o  2 default {foo} draft c_c
 |
 $ hg up 'desc(c_d)'
 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)
 $ hg log -G
 o  13 default {foo} draft c_h
 |
 o  12 default {foo} draft c_g
 |
 @  11 default {foo} draft c_D
 |
-| *  8 default {foo} draft c_f
+| o  8 default {foo} draft c_f
 | |
-| *  7 default {foo} draft c_e
+| o  7 default {foo} draft c_e
 | |
 | x  6 default {foo} draft c_d
 |/
 o  2 default {foo} draft c_c
 |
 |
 o  12 default {foo} draft c_g
 |
 @  11 default {foo} draft c_D
 |
-| *  8 default {foo} draft c_f
+| o  8 default {foo} draft c_f
 | |
-| *  7 default {foo} draft c_e
+| o  7 default {foo} draft c_e
 | |
 | x  6 default {foo} draft c_d
 |/
 o  2 default {foo} draft c_c
 |
 o  0 default {} public c_a
 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
 |
-| *  16 default {foobar} draft c_e
+| o  16 default {foobar} draft c_e
 | |
-| | *  15 default {foo} draft c_f
+| | o  15 default {foo} draft c_f
 | | |
 | | x  14 default {foo} draft c_e
 | |/
-| *  13 default {foo} draft c_h
+| o  13 default {foo} draft c_h
 | |
-| *  12 default {foo} draft c_g
+| o  12 default {foo} draft c_g
 | |
 | x  11 default {foo} draft c_D
 |/
 o  2 default {foo} draft c_c
 |
 o  0 default {} public c_a
 $ 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)
 switching to topic foo
 rebasing 13:b9e4f3709bc5 "c_h" (foo)
 $ hg up 'desc("c_B")'
 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
 $ hg up 'desc("c_D")'
 switching to topic blue
 $ hg commit --amend --user test2
 $ hg log -G --rev 'sort(all(), "topo")'
 @  11 default {blue} draft c_D
 |
-| *  8 default {blue} draft c_I
+| o  8 default {blue} draft c_I
 | |
-| *    7 default {red} draft c_H
+| o    7 default {red} draft c_H
 | |\
-| | *  6 default {blue} draft c_G
+| | o  6 default {blue} draft c_G
 | | |
-| | *  5 default {red} draft c_F
+| | o  5 default {red} draft c_F
 | | |
-| | *  4 default {red} draft c_E
+| | o  4 default {red} draft c_E
 | | |
 | x |  3 default {blue} draft c_D
 |/ /
 x /  2 default {red} draft c_C
 |/
-| *  10 default {red} draft c_C
+| o  10 default {red} draft c_C
 |/
 x  1 default {red} draft c_B
 |
 | o  9 default {red} draft c_B
 |/
 $ hg commit --amend --user test3
 $ hg log -G --rev 'sort(all(), "topo")'
 @  16 default {blue} draft c_D
 |
-| *  13 default {blue} draft c_G
+| o  13 default {blue} draft c_G
 | |
-| | *    12 default {red} draft c_H
+| | o    12 default {red} draft c_H
 | | |\
-| | | | *  8 default {blue} draft c_I
+| | | | o  8 default {blue} draft c_I
 | | | | |
 | | +---x  7 default {red} draft c_H
 | | | |/
 | +---x  6 default {blue} draft c_G
 | | |
-| * |  5 default {red} draft c_F
+| o |  5 default {red} draft c_F
 | | |
-| * |  4 default {red} draft c_E
+| o |  4 default {red} draft c_E
 | | |
 +---x  3 default {blue} draft c_D
 | |
 x |  2 default {red} draft c_C
 |/
-| *  15 default {red} draft c_C
+| o  15 default {red} draft c_C
 |/
 x  1 default {red} draft c_B
 |
 | o  14 default {red} draft c_B
 |/
 $ hg status --change .
 A ggg
 $ echo zzz > Z
 $ hg add Z
 $ hg commit --amend
-1 new orphan changesets
 $ hg status --change .
 A Z
 A ggg
 $ hg stack
 ### topic: blue
 |/
 x  b24bab30ac12 (20) c_G
 |    rewritten(parent, content) as dde94df880e9, e7ea874afbd5 using split by test (Thu Jan 01 00:00:00 1970 +0000)
 |
 x  907f7d3c2333 (18) c_G
-|    rewritten(content) as b24bab30ac12 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+|    rewritten as b24bab30ac12 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 |
 x  3ab2eedae500 (13) c_G
-|    rewritten(parent) as 907f7d3c2333 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
+|    rewritten as 907f7d3c2333 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
 |
 x  c7d60a180d05 (6) c_G
-rewritten(user) as 3ab2eedae500 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+rewritten as 3ab2eedae500 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 $ hg export .
 # HG changeset patch
 # User test3
 # Date 0 0

branch	mercurial-4.4
changeset 4206	04aeaec6ec07
parent 4076	f9a850018daa
child 4077	9c025ec4af88
child 4308	c06301c5b3e2