Mercurial > evolve
diff tests/test-evolve-orphan-merge.t @ 6042:1cbafebe874b
tests: add {instabilities} to the common glog alias
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Tue, 21 Sep 2021 22:11:31 +0300 |
parents | 6b7ef731141b |
children | c0921b5277a0 b1d1f4ade142 |
line wrap: on
line diff
--- a/tests/test-evolve-orphan-merge.t Mon Sep 20 20:47:31 2021 +0300 +++ b/tests/test-evolve-orphan-merge.t Tue Sep 21 22:11:31 2021 +0300 @@ -56,7 +56,7 @@ @ 4:64370c9805e7 added b | () draft | * 3:3b2b6f4652ee merging a and b - | |\ () draft + | |\ () draft orphan +---x 2:d76850646258 added b | | () draft | o 1:c7586e2a9264 added a @@ -101,7 +101,7 @@ @ 6:3d41537b44ca added a | () draft | * 5:91fd62122a4b merging a and b - | |\ () draft + | |\ () draft orphan +---o 4:64370c9805e7 added b | | () draft | x 1:c7586e2a9264 added a @@ -194,7 +194,7 @@ @ 11:31c317b7bdb1 foo to c | () draft | * 10:fd41d25a3e90 foobar to c - | |\ () draft + | |\ () draft orphan +---o 9:d0f84b25d4e3 bar to c | | () draft | x 8:1c165c673853 foo to c @@ -250,7 +250,7 @@ @ 13:928097d0b5b5 foo to c | () draft | * 12:c5405d2da7a1 foobar to c - | |\ () draft + | |\ () draft orphan +---x 11:31c317b7bdb1 foo to c | | () draft | o 9:d0f84b25d4e3 bar to c @@ -325,13 +325,13 @@ @ 20:fccc9de66799 added l | () draft | * 19:190763373d8b merge commit - | |\ () draft + | |\ () draft orphan | | o 18:863d11043c67 added y | | | () draft +---o 17:3f2247835c1d added x | | () draft | * 16:e44dc179e7f5 added m - | | () draft + | | () draft orphan | x 15:8634bee7bf1e added l |/ () draft o 0:8fa14d15e168 added hgignore @@ -392,7 +392,7 @@ | o 24:3f371171d767 added l |/ () draft | * 23:7b78a9784f3e merged l and x - | |\ () draft + | |\ () draft orphan +---x 20:fccc9de66799 added l | | () draft | x 17:3f2247835c1d added x @@ -452,7 +452,7 @@ 1 new orphan changesets $ hg glog @ 27:adb665a78e08 merged l and x - |\ () draft + |\ () draft orphan | x 25:cdf6547da25f added x | | () draft o | 24:3f371171d767 added l @@ -491,7 +491,7 @@ $ hg glog @ 28:fb8fe870ae7d merged l and x - |\ () draft + |\ () draft orphan | x 24:3f371171d767 added l |/ () draft o 0:8fa14d15e168 added hgignore @@ -556,7 +556,7 @@ $ hg glog @ 30:32beb84b9dbc merge commit - |\ () draft + |\ () draft orphan | x 29:f3ba8b99bb6f added foo | () draft o 0:8fa14d15e168 added hgignore