Mercurial > evolve
diff tests/test-unstable-orphan.t @ 4577:bcd52ce0916d
evolve: don't update after instability resolution by default (BC)
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Wed, 24 Apr 2019 15:59:02 +0200 |
| parents | a2273aa71a4b |
| children | 79bc0f1a832e a1dad44fe3da |
line wrap: on
line diff
--- a/tests/test-unstable-orphan.t Sun Apr 14 02:18:19 2019 +0800 +++ b/tests/test-unstable-orphan.t Wed Apr 24 15:59:02 2019 +0200 @@ -65,11 +65,10 @@ $ hg evo --all --any --orphan move:[2] add _c atop:[3] bprime - working directory is now at fdcf3523a74d $ hg log -G - @ 4:fdcf3523a74d@default(draft) add _c + o 4:fdcf3523a74d@default(draft) add _c | - o 3:36050226a9b9@default(draft) bprime + @ 3:36050226a9b9@default(draft) bprime | o 0:135f39f4bd78@default(draft) add _a @@ -117,11 +116,10 @@ $ hg evo --all --any --orphan move:[2] add _c atop:[6] add bsecondsplit2 - working directory is now at 98e3f21461ff $ hg log -G - @ 7:98e3f21461ff@default(draft) add _c + o 7:98e3f21461ff@default(draft) add _c | - o 6:59b942dbda14@default(draft) add bsecondsplit2 + @ 6:59b942dbda14@default(draft) add bsecondsplit2 | o 5:8ffdae67d696@default(draft) add bsecondsplit1 |