Mercurial > evolve
diff tests/test-evolve-abort.t @ 3714:19ec729f3ca2 mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 23 Apr 2018 12:11:10 +0200 |
| parents | f6979d64b9fb |
| children | e5ba6531503e 5ca297e78f2c |
line wrap: on
line diff
--- a/tests/test-evolve-abort.t Tue Apr 24 08:57:18 2018 +0100 +++ b/tests/test-evolve-abort.t Mon Apr 23 12:11:10 2018 +0200 @@ -91,7 +91,7 @@ $ hg glog @ 5:e93a9161a274 added c | () draft - | * 4:c41c793e0ef1 added d + | o 4:c41c793e0ef1 added d | | () draft | x 3:ca1b80f7960a added c |/ () draft @@ -153,9 +153,9 @@ | () draft o 7:125af0ed8cae added a | () draft - | * 6:e83de241f751 added d + | o 6:e83de241f751 added d | | () draft - | * 5:e93a9161a274 added c + | o 5:e93a9161a274 added c | | () draft | x 2:b1661037fa25 added b | | () draft @@ -165,18 +165,17 @@ () draft $ hg evolve --abort - 1 new orphan changesets evolve aborted working directory is now at 125af0ed8cae $ hg glog @ 7:125af0ed8cae added a | () draft - | * 6:e83de241f751 added d + | o 6:e83de241f751 added d | | () draft - | * 5:e93a9161a274 added c + | o 5:e93a9161a274 added c | | () draft - | * 2:b1661037fa25 added b + | o 2:b1661037fa25 added b | | () draft | x 1:c7586e2a9264 added a |/ () draft @@ -250,13 +249,13 @@ |/ () draft @ 7:807e8e2ca559 added a | () draft - | * 6:8f20d4390c21 foo to a + | o 6:8f20d4390c21 foo to a | | () draft - | | * 5:bcb1c47f8520 added d + | | o 5:bcb1c47f8520 added d | | | () draft | | x 4:86d2603075a3 added c | |/ () draft - | | * 3:17509928e5bf added c + | | o 3:17509928e5bf added c | | | () draft | | x 2:9f0c80a55ddc added b | |/ () draft @@ -266,22 +265,21 @@ () draft $ hg evolve --abort - 2 new orphan changesets evolve aborted working directory is now at 807e8e2ca559 $ hg glog @ 7:807e8e2ca559 added a | () draft - | * 6:8f20d4390c21 foo to a + | o 6:8f20d4390c21 foo to a | | () draft - | | * 5:bcb1c47f8520 added d + | | o 5:bcb1c47f8520 added d | | | () draft - | | * 4:86d2603075a3 added c + | | o 4:86d2603075a3 added c | |/ () draft - | | * 3:17509928e5bf added c + | | o 3:17509928e5bf added c | | | () draft - | | * 2:9f0c80a55ddc added b + | | o 2:9f0c80a55ddc added b | |/ () draft | x 1:2f913b0c9220 added a |/ () draft @@ -315,13 +313,13 @@ |/ () draft @ 7:807e8e2ca559 added a | () draft - | * 6:8f20d4390c21 foo to a + | o 6:8f20d4390c21 foo to a | | () draft - | | * 5:bcb1c47f8520 added d + | | o 5:bcb1c47f8520 added d | | | () draft | | x 4:86d2603075a3 added c | |/ () draft - | | * 3:17509928e5bf added c + | | o 3:17509928e5bf added c | | | () draft | | x 2:9f0c80a55ddc added b | |/ () draft @@ -346,7 +344,6 @@ adding file changes added 10 changesets with 8 changes to 5 files (+4 heads) 3 new obsolescence markers - 3 new orphan changesets $ cd ../clonerepo $ hg up 7f8e8bd9f0b6 3 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -401,7 +398,7 @@ |/ () draft @ 7:807e8e2ca559 added a | () draft - | * 6:8f20d4390c21 foo to a + | o 6:8f20d4390c21 foo to a | | () draft | x 1:2f913b0c9220 added a |/ () draft @@ -445,9 +442,9 @@ $ hg glog @ 4:a0086c17bfc7 added a | () draft - | * 3:17509928e5bf added c + | o 3:17509928e5bf added c | | () draft - | * 2:9f0c80a55ddc added b + | o 2:9f0c80a55ddc added b | | (bm1) draft | x 1:2f913b0c9220 added a |/ () draft @@ -471,7 +468,7 @@ | (bm1) draft o 4:a0086c17bfc7 added a | () draft - | * 3:17509928e5bf added c + | o 3:17509928e5bf added c | | () draft | x 2:9f0c80a55ddc added b | | () draft @@ -481,16 +478,15 @@ () draft $ hg evolve --abort - 1 new orphan changesets evolve aborted working directory is now at a0086c17bfc7 $ hg glog @ 4:a0086c17bfc7 added a | () draft - | * 3:17509928e5bf added c + | o 3:17509928e5bf added c | | () draft - | * 2:9f0c80a55ddc added b + | o 2:9f0c80a55ddc added b | | (bm1) draft | x 1:2f913b0c9220 added a |/ () draft