Mercurial > evolve
diff tests/test-stabilize-result.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 | fe16284cd95a |
| children | 98941c28f3e2 19ec729f3ca2 |
line wrap: on
line diff
--- a/tests/test-stabilize-result.t Wed Mar 21 16:03:46 2018 +0100 +++ b/tests/test-stabilize-result.t Wed Mar 21 16:06:17 2018 +0100 @@ -218,8 +218,6 @@ $ echo 'babar' >> a $ hg amend $ hg up --hidden 3932c176bbaa - updating to a hidden changeset 3932c176bbaa - (hidden revision '3932c176bbaa' was rewritten as: d2f173e25686) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (3932c176bbaa) (use 'hg evolve' to update to its successor: d2f173e25686) @@ -232,7 +230,7 @@ $ glog @ 14:eacc9c8240fe@default(draft) bk:[] More addition | - | * 13:d2f173e25686@default(draft) bk:[] More addition + | o 13:d2f173e25686@default(draft) bk:[] More addition |/ | o 11:3d968e0b3097@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: | | @@ -328,8 +326,6 @@ ------------------------------------------------- $ hg up --hidden 3932c176bbaa - updating to a hidden changeset 3932c176bbaa - (hidden revision '3932c176bbaa' was rewritten as: f344982e63c4) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (3932c176bbaa) (use 'hg evolve' to update to its successor: f344982e63c4)