Mercurial > evolve
diff tests/test-stabilize-result.t @ 3930:d00f0c369bc7 mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 02 Aug 2018 02:47:44 +0200 |
| parents | 19ec729f3ca2 f7afd3a158e3 |
| children | 537fd9a86c06 f9a850018daa |
line wrap: on
line diff
--- a/tests/test-stabilize-result.t Thu Aug 02 02:42:15 2018 +0200 +++ b/tests/test-stabilize-result.t Thu Aug 02 02:47:44 2018 +0200 @@ -237,8 +237,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) @@ -251,7 +249,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:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: | | @@ -345,8 +343,6 @@ ------------------------------------------------- $ hg up --hidden 3932c176bbaa - updating to a hidden changeset 3932c176bbaa - (hidden revision '3932c176bbaa' was rewritten as: 4d6ed26797bc) 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: 4d6ed26797bc) @@ -362,7 +358,7 @@ $ glog @ 17:0b336205a5d0@default(draft) bk:[] More addition (2) | - | * 15:4d6ed26797bc@default(draft) bk:[] More addition + | o 15:4d6ed26797bc@default(draft) bk:[] More addition |/ | o 11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: | |