Mercurial > evolve
diff tests/test-evolve-stop-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 | 96ce1030d2fb |
| children | 63a816beee7e b6c819facbe8 |
line wrap: on
line diff
--- a/tests/test-evolve-stop-orphan.t Sun Apr 14 02:18:19 2019 +0800 +++ b/tests/test-evolve-stop-orphan.t Wed Apr 24 15:59:02 2019 +0200 @@ -293,13 +293,13 @@ evolving 5:cb6a2ab625bb "added c" move:[6] added d atop:[10] added c - working directory is now at cd0909a30222 + working directory is now at aec285328e90 $ hg glog - @ 11:cd0909a30222 added d + o 11:cd0909a30222 added d | () draft o 10:cb1dd1086ef6 added c | () draft - o 9:aec285328e90 added b + @ 9:aec285328e90 added b | () draft o 8:fd00db71edca added a | () draft @@ -310,8 +310,8 @@ bookmarks of rest of them should stay where they are are ------------------------------------------------------------------------- - $ hg up .^ - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ hg up tip^ + 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg bookmark b1 $ hg up .^ 1 files updated, 0 files merged, 1 files removed, 0 files unresolved