Mercurial > evolve
diff tests/test-uncommit.t @ 3923:257481642686 mercurial-4.6
test-compat: merge stable into mercurial-4.6
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 02 Aug 2018 01:57:13 +0200 |
| parents | f7afd3a158e3 |
| children | d00f0c369bc7 d70db7e455dc |
line wrap: on
line diff
--- a/tests/test-uncommit.t Thu Aug 02 02:15:48 2018 +0200 +++ b/tests/test-uncommit.t Thu Aug 02 01:57:13 2018 +0200 @@ -238,10 +238,10 @@ 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) - updated to hidden changeset 5eb72dbe0cb4 - (hidden revision '5eb72dbe0cb4' was rewritten as: e8db4aa611f6) working directory parent is obsolete! (5eb72dbe0cb4) (use 'hg evolve' to update to its successor: e8db4aa611f6) $ hg --config extensions.purge= purge @@ -287,9 +287,9 @@ 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 - updated to hidden changeset 5eb72dbe0cb4 - (hidden revision '5eb72dbe0cb4' has diverged) working directory parent is obsolete! (5eb72dbe0cb4) (5eb72dbe0cb4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) $ hg --config extensions.purge= purge