Mercurial > evolve
diff tests/test-evolve-topic.t @ 3590:d5adce52cef4 mercurial-4.4
test-compat: merge stable into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 21 Mar 2018 16:06:17 +0100 |
| parents | 031d70bcbb42 |
| children | 98941c28f3e2 d00f0c369bc7 |
line wrap: on
line diff
--- a/tests/test-evolve-topic.t Wed Mar 21 16:03:46 2018 +0100 +++ b/tests/test-evolve-topic.t Wed Mar 21 16:06:17 2018 +0100 @@ -98,17 +98,17 @@ | | o 10 - {foo} d9cacd156ffc add ddd (draft) | | - | | * 9 - {bar} 1d964213b023 add jjj (draft) + | | o 9 - {bar} 1d964213b023 add jjj (draft) | | | - | | * 8 - {bar} fcab990f3261 add iii (draft) + | | o 8 - {bar} fcab990f3261 add iii (draft) | | | - | | * 7 - {bar} b0c2554835ac add hhh (draft) + | | o 7 - {bar} b0c2554835ac add hhh (draft) | | | - | | * 6 - {bar} c748293f1c1a add ggg (draft) + | | o 6 - {bar} c748293f1c1a add ggg (draft) | | | +---x 5 - {foo} 6a6b7365c751 add fff (draft) | | - * | 4 - {foo} 3969ab847d9c add eee (draft) + o | 4 - {foo} 3969ab847d9c add eee (draft) | | x | 3 - {foo} 4e3a154f38c7 add ddd (draft) |/ @@ -134,13 +134,13 @@ | o 10 - {foo} d9cacd156ffc add ddd (draft) | - | * 9 - {bar} 1d964213b023 add jjj (draft) + | o 9 - {bar} 1d964213b023 add jjj (draft) | | - | * 8 - {bar} fcab990f3261 add iii (draft) + | o 8 - {bar} fcab990f3261 add iii (draft) | | - | * 7 - {bar} b0c2554835ac add hhh (draft) + | o 7 - {bar} b0c2554835ac add hhh (draft) | | - | * 6 - {bar} c748293f1c1a add ggg (draft) + | o 6 - {bar} c748293f1c1a add ggg (draft) | | | x 5 - {foo} 6a6b7365c751 add fff (draft) | | @@ -249,7 +249,6 @@ o 0 - {} 199cc73e9a0b add aaa (draft) $ hg topic -r 070c5573d8f9 bar - 4 new orphan changesets changed topic on 1 changes $ hg up 16d6f664b17c switching to topic bar @@ -275,13 +274,13 @@ $ hg log --graph @ 18 - {bar} 793eb6370b2d add fff (draft) | - | * 17 - {bar} 9bf430c106b7 add jjj (draft) + | o 17 - {bar} 9bf430c106b7 add jjj (draft) | | - | * 16 - {bar} d2dc89c57700 add iii (draft) + | o 16 - {bar} d2dc89c57700 add iii (draft) | | - | * 15 - {bar} 20bc4d02aa62 add hhh (draft) + | o 15 - {bar} 20bc4d02aa62 add hhh (draft) | | - | * 14 - {bar} 16d6f664b17c add ggg (draft) + | o 14 - {bar} 16d6f664b17c add ggg (draft) | | | x 13 - {foo} 070c5573d8f9 add fff (draft) |/ @@ -311,15 +310,15 @@ working directory parent is obsolete! (20bc4d02aa62) (use 'hg evolve' to update to its successor: d834582d9ee3) $ hg log -Gr 14:: - * 19 - {bar} d834582d9ee3 add hhh (draft) + o 19 - {bar} d834582d9ee3 add hhh (draft) | - | * 17 - {bar} 9bf430c106b7 add jjj (draft) + | o 17 - {bar} 9bf430c106b7 add jjj (draft) | | - | * 16 - {bar} d2dc89c57700 add iii (draft) + | o 16 - {bar} d2dc89c57700 add iii (draft) | | | @ 15 - {bar} 20bc4d02aa62 add hhh (draft) |/ - * 14 - {bar} 16d6f664b17c add ggg (draft) + o 14 - {bar} 16d6f664b17c add ggg (draft) | ~ @@ -332,15 +331,13 @@ $ hg rebase -s d2dc89c57700 -d d834582d9ee3 --config extensions.rebase= rebasing 16:d2dc89c57700 "add iii" (bar) - 1 new orphan changesets rebasing 17:9bf430c106b7 "add jjj" (bar) - 1 new orphan changesets $ hg log -Gr 42b49017ff90:: - * 21 - {bar} 7542e76aba2c add jjj (draft) + o 21 - {bar} 7542e76aba2c add jjj (draft) | - * 20 - {bar} 7858bd7e9906 add iii (draft) + o 20 - {bar} 7858bd7e9906 add iii (draft) | - * 19 - {bar} d834582d9ee3 add hhh (draft) + o 19 - {bar} d834582d9ee3 add hhh (draft) | | o 18 - {bar} 793eb6370b2d add fff (draft) | |