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

equal deleted inserted replaced

-:d5adce52cef4
+:98941c28f3e2
 t0^ add bbb (base)
 $ hg up 'desc(ddd)'
 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
 $ echo ddd >> ddd
 $ hg amend
-6 new orphan changesets
+6 new unstable changesets
 $ hg up 'desc(fff)'
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ echo fff >> fff
 $ hg amend
 $ hg log -G
-@  11 - {foo} e104f49bab28 add fff (draft)
+@  13 - {foo} e104f49bab28 add fff (draft)
 |
-| o  10 - {foo} d9cacd156ffc add ddd (draft)
+| o  11 - {foo} d9cacd156ffc add ddd (draft)
 | |
 | | o  9 - {bar} 1d964213b023 add jjj (draft)
 | | |
 | | o  8 - {bar} fcab990f3261 add iii (draft)
 | | |
 Run evolve --all
 $ hg evolve --all
 move:[4] add eee
-atop:[10] add ddd
+atop:[11] add ddd
-move:[11] add fff
+move:[13] add fff
-atop:[12] add eee
+atop:[14] add eee
 working directory is now at 070c5573d8f9
 $ hg log -G
-@  13 - {foo} 070c5573d8f9 add fff (draft)
+@  15 - {foo} 070c5573d8f9 add fff (draft)
 |
-o  12 - {foo} 42b49017ff90 add eee (draft)
+o  14 - {foo} 42b49017ff90 add eee (draft)
 |
-o  10 - {foo} d9cacd156ffc add ddd (draft)
+o  11 - {foo} d9cacd156ffc add ddd (draft)
 |
 | o  9 - {bar} 1d964213b023 add jjj (draft)
 | |
 | o  8 - {bar} fcab990f3261 add iii (draft)
 | |
 Test that evolve does not loose topic information
 -------------------------------------------------
 $ hg evolve --rev 'topic(bar)'
 move:[6] add ggg
-atop:[13] add fff
+atop:[15] add fff
 move:[7] add hhh
-atop:[14] add ggg
+atop:[16] add ggg
 move:[8] add iii
-atop:[15] add hhh
+atop:[17] add hhh
 move:[9] add jjj
-atop:[16] add iii
+atop:[18] add iii
 working directory is now at 9bf430c106b7
 $ hg log -G
-@  17 - {bar} 9bf430c106b7 add jjj (draft)
+@  19 - {bar} 9bf430c106b7 add jjj (draft)
 |
-o  16 - {bar} d2dc89c57700 add iii (draft)
+o  18 - {bar} d2dc89c57700 add iii (draft)
 |
-o  15 - {bar} 20bc4d02aa62 add hhh (draft)
+o  17 - {bar} 20bc4d02aa62 add hhh (draft)
 |
-o  14 - {bar} 16d6f664b17c add ggg (draft)
+o  16 - {bar} 16d6f664b17c add ggg (draft)
 |
-o  13 - {foo} 070c5573d8f9 add fff (draft)
+o  15 - {foo} 070c5573d8f9 add fff (draft)
 |
-o  12 - {foo} 42b49017ff90 add eee (draft)
+o  14 - {foo} 42b49017ff90 add eee (draft)
 |
-o  10 - {foo} d9cacd156ffc add ddd (draft)
+o  11 - {foo} d9cacd156ffc add ddd (draft)
 |
 o  2 - {foo} cced9bac76e3 add ccc (draft)
 |
 o  1 - {} a4dbed0837ea add bbb (draft)
 |
 $ hg up foo
 switching to topic foo
 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
 $ hg prev
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-[12] add eee
+[14] add eee
 $ hg next
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-[13] add fff
+[15] add fff
 $ hg next
 no children on topic "foo"
 do you want --no-topic
 [1]
 $ hg next --no-topic
 switching to topic bar
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-[14] add ggg
+[16] add ggg
 $ hg prev
 preserving the current topic 'bar'
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-[13] add fff
+[15] add fff
 $ hg prev
 no parent in topic "bar"
 (do you want --no-topic)
 [1]
 $ hg prev --no-topic
 switching to topic foo
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-[12] add eee
+[14] add eee
 Testing when instability is involved
 $ hg log -G
-o  17 - {bar} 9bf430c106b7 add jjj (draft)
+o  19 - {bar} 9bf430c106b7 add jjj (draft)
 |
-o  16 - {bar} d2dc89c57700 add iii (draft)
+o  18 - {bar} d2dc89c57700 add iii (draft)
 |
-o  15 - {bar} 20bc4d02aa62 add hhh (draft)
+o  17 - {bar} 20bc4d02aa62 add hhh (draft)
 |
-o  14 - {bar} 16d6f664b17c add ggg (draft)
+o  16 - {bar} 16d6f664b17c add ggg (draft)
 |
-o  13 - {foo} 070c5573d8f9 add fff (draft)
+o  15 - {foo} 070c5573d8f9 add fff (draft)
 |
-@  12 - {foo} 42b49017ff90 add eee (draft)
+@  14 - {foo} 42b49017ff90 add eee (draft)
 |
-o  10 - {foo} d9cacd156ffc add ddd (draft)
+o  11 - {foo} d9cacd156ffc add ddd (draft)
 |
 o  2 - {foo} cced9bac76e3 add ccc (draft)
 |
 o  1 - {} a4dbed0837ea add bbb (draft)
 |
 t1: add fff
 t0^ add eee (base)
 $ hg prev
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-[18] add fff
+[20] add fff
 Testing issue 5708 when we are on obsolete changeset and there is active topic
 ------------------------------------------------------------------------------
 $ hg log --graph
-@  18 - {bar} 793eb6370b2d add fff (draft)
+@  20 - {bar} 793eb6370b2d add fff (draft)
 |
-| o  17 - {bar} 9bf430c106b7 add jjj (draft)
+| o  19 - {bar} 9bf430c106b7 add jjj (draft)
 | |
-| o  16 - {bar} d2dc89c57700 add iii (draft)
+| o  18 - {bar} d2dc89c57700 add iii (draft)
 | |
-| o  15 - {bar} 20bc4d02aa62 add hhh (draft)
+| o  17 - {bar} 20bc4d02aa62 add hhh (draft)
 | |
-| o  14 - {bar} 16d6f664b17c add ggg (draft)
+| o  16 - {bar} 16d6f664b17c add ggg (draft)
 | |
-| x  13 - {foo} 070c5573d8f9 add fff (draft)
+| x  15 - {foo} 070c5573d8f9 add fff (draft)
 |/
-o  12 - {foo} 42b49017ff90 add eee (draft)
+o  14 - {foo} 42b49017ff90 add eee (draft)
 |
-o  10 - {foo} d9cacd156ffc add ddd (draft)
+o  11 - {foo} d9cacd156ffc add ddd (draft)
 |
 o  2 - {foo} cced9bac76e3 add ccc (draft)
 |
 o  1 - {} a4dbed0837ea add bbb (draft)
 |
 $ hg up 20bc4d02aa62
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 working directory parent is obsolete! (20bc4d02aa62)
 (use 'hg evolve' to update to its successor: d834582d9ee3)
 $ hg log -Gr 14::
-o  19 - {bar} d834582d9ee3 add hhh (draft)
+o  22 - {bar} d834582d9ee3 add hhh (draft)
 |
-| o  17 - {bar} 9bf430c106b7 add jjj (draft)
+| o  20 - {bar} 793eb6370b2d add fff (draft)
 | |
-| o  16 - {bar} d2dc89c57700 add iii (draft)
+| | o  19 - {bar} 9bf430c106b7 add jjj (draft)
-| |
+| | |
-| @  15 - {bar} 20bc4d02aa62 add hhh (draft)
+| | o  18 - {bar} d2dc89c57700 add iii (draft)
-|/
+| | |
-o  14 - {bar} 16d6f664b17c add ggg (draft)
++---@  17 - {bar} 20bc4d02aa62 add hhh (draft)
+| |
+o |  16 - {bar} 16d6f664b17c add ggg (draft)
+| |
+x |  15 - {foo} 070c5573d8f9 add fff (draft)
+|/
+o  14 - {foo} 42b49017ff90 add eee (draft)
 |
 ~
 $ hg prev
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-[14] add ggg
+[16] add ggg
 When the current topic and successors topic are same, but obsolete cset has
 different topic
 $ hg rebase -s d2dc89c57700 -d d834582d9ee3 --config extensions.rebase=
-rebasing 16:d2dc89c57700 "add iii" (bar)
+rebasing 18:d2dc89c57700 "add iii"
-rebasing 17:9bf430c106b7 "add jjj" (bar)
+rebasing 19:9bf430c106b7 "add jjj"
 $ hg log -Gr 42b49017ff90::
-o  21 - {bar} 7542e76aba2c add jjj (draft)
+o  24 - {bar} 7542e76aba2c add jjj (draft)
 |
-o  20 - {bar} 7858bd7e9906 add iii (draft)
+o  23 - {bar} 7858bd7e9906 add iii (draft)
 |
-o  19 - {bar} d834582d9ee3 add hhh (draft)
+o  22 - {bar} d834582d9ee3 add hhh (draft)
 |
-| o  18 - {bar} 793eb6370b2d add fff (draft)
+| o  20 - {bar} 793eb6370b2d add fff (draft)
 | |
-@ |  14 - {bar} 16d6f664b17c add ggg (draft)
+@ |  16 - {bar} 16d6f664b17c add ggg (draft)
 | |
-x |  13 - {foo} 070c5573d8f9 add fff (draft)
+x |  15 - {foo} 070c5573d8f9 add fff (draft)
 |/
-o  12 - {foo} 42b49017ff90 add eee (draft)
+o  14 - {foo} 42b49017ff90 add eee (draft)
 |
 ~
 $ hg up 070c5573d8f9
 switching to topic foo
 $ hg up 070c5573d8f9
 switching to topic foo
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ hg prev
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-[12] add eee
+[14] add eee

branch	mercurial-4.3
changeset 3591	98941c28f3e2
parent 3590	d5adce52cef4
parent 3418	85cdce113c2c
child 3593	b92114f201c9
child 3936	537fd9a86c06