Mercurial > evolve
diff tests/test-uncommit.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 | d5adce52cef4 f7afd3a158e3 |
| children | 537fd9a86c06 a2fdbece7ce1 |
line wrap: on
line diff
--- a/tests/test-uncommit.t Thu Aug 02 02:42:15 2018 +0200 +++ b/tests/test-uncommit.t Thu Aug 02 02:47:44 2018 +0200 @@ -238,8 +238,6 @@ Test phase is preserved, no local changes $ hg up -C 3 --hidden - updating to a hidden changeset 5eb72dbe0cb4 - (hidden revision '5eb72dbe0cb4' was rewritten as: e8db4aa611f6) 8 files updated, 0 files merged, 1 files removed, 0 files unresolved (leaving bookmark touncommit-bm) working directory parent is obsolete! (5eb72dbe0cb4) @@ -270,7 +268,7 @@ $ glog --hidden @ 5:a1d4c1ad76cc@bar(draft) touncommit | - | * 4:e8db4aa611f6@bar(draft) touncommit + | o 4:e8db4aa611f6@bar(draft) touncommit |/ | x 3:5eb72dbe0cb4@bar(obsolete/draft) touncommit |/ @@ -287,8 +285,6 @@ Test --all $ hg up -C 3 --hidden - updating to a hidden changeset 5eb72dbe0cb4 - (hidden revision '5eb72dbe0cb4' has diverged) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (5eb72dbe0cb4) (5eb72dbe0cb4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)