Mercurial > evolve
diff tests/test-tutorial.t @ 3592:7a5c3175015e mercurial-4.2
test-compat: merge mercurial-4.3 into mercurial-4.2
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 21 Mar 2018 16:32:54 +0100 |
| parents | 98941c28f3e2 1e2f683e11e7 |
| children | b92114f201c9 |
line wrap: on
line diff
--- a/tests/test-tutorial.t Wed Mar 21 16:18:31 2018 +0100 +++ b/tests/test-tutorial.t Wed Mar 21 16:32:54 2018 +0100 @@ -997,7 +997,9 @@ But at the same time, locally, this same "bathroom changeset" was updated. $ cd ../local - $ hg up 4710c0968793 -q + $ hg up 75954b8cd933 -q + abort: unknown revision '75954b8cd933'! + [255] $ sed -i'' -e 's/... More bathroom stuff to come/Bath Robe/' shopping $ hg commit --amend $ hg log -G @@ -1204,7 +1206,6 @@ adding file changes added 2 changesets with 2 changes to 1 files (+1 heads) 3 new obsolescence markers - obsoleted 2 changesets Remote get a warning that current working directory is based on an obsolete changeset.