Mercurial > evolve
diff tests/test-tutorial.t @ 4363:a2fdbece7ce1 mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 22 Jan 2019 12:57:25 -0500 |
| parents | 2cbb9914d227 04aeaec6ec07 |
| children | 79bc0f1a832e |
line wrap: on
line diff
--- a/tests/test-tutorial.t Tue Jan 22 12:55:09 2019 -0500 +++ b/tests/test-tutorial.t Tue Jan 22 12:57:25 2019 -0500 @@ -1211,7 +1211,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - 1 new orphan changesets new changesets e4e4fa805d92 (run 'hg update' to get a working copy) @@ -1219,7 +1218,7 @@ see both version showing up in the log. $ hg log -G - * e4e4fa805d92 (draft): animals + o e4e4fa805d92 (draft): animals | | @ 682004e81e71 (draft): bathroom stuff | | @@ -1675,14 +1674,13 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory now at 682004e81e71 1 changesets pruned - 1 new orphan changesets The animals changeset is still displayed because the "SPAM SPAM SPAM" changeset is neither dead or obsolete. My repository is in an unstable state again. $ hg log -G - * fc41faf45288 (draft): SPAM SPAM SPAM + o fc41faf45288 (draft): SPAM SPAM SPAM | x 2a2b36e14660 (draft): animals |