comparison tests/test-tutorial.t @ 4206:04aeaec6ec07 mercurial-4.4

test-compat: merge mercurial-4.5 into mercurial-4.4
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 25 Oct 2018 13:05:14 +0200
parents f555039d1a08 e268f7fd7839
children 3d917da5bd95 a2fdbece7ce1
comparison
equal deleted inserted replaced
4205:6be09fb2c08c 4206:04aeaec6ec07
1209 searching for changes 1209 searching for changes
1210 adding changesets 1210 adding changesets
1211 adding manifests 1211 adding manifests
1212 adding file changes 1212 adding file changes
1213 added 1 changesets with 1 changes to 1 files 1213 added 1 changesets with 1 changes to 1 files
1214 1 new orphan changesets
1215 new changesets e4e4fa805d92 1214 new changesets e4e4fa805d92
1216 (run 'hg update' to get a working copy) 1215 (run 'hg update' to get a working copy)
1216 1 new orphan changesets
1217 1217
1218 The new changeset "animal" is based on an old changeset of "bathroom". You can 1218 The new changeset "animal" is based on an old changeset of "bathroom". You can
1219 see both version showing up in the log. 1219 see both version showing up in the log.
1220 1220
1221 $ hg log -G 1221 $ hg log -G
1222 * e4e4fa805d92 (draft): animals 1222 o e4e4fa805d92 (draft): animals
1223 | 1223 |
1224 | @ 682004e81e71 (draft): bathroom stuff 1224 | @ 682004e81e71 (draft): bathroom stuff
1225 | | 1225 | |
1226 x | 4710c0968793 (draft): bathroom stuff 1226 x | 4710c0968793 (draft): bathroom stuff
1227 |/ 1227 |/
1680 1680
1681 The animals changeset is still displayed because the "SPAM SPAM SPAM" changeset 1681 The animals changeset is still displayed because the "SPAM SPAM SPAM" changeset
1682 is neither dead or obsolete. My repository is in an unstable state again. 1682 is neither dead or obsolete. My repository is in an unstable state again.
1683 1683
1684 $ hg log -G 1684 $ hg log -G
1685 * fc41faf45288 (draft): SPAM SPAM SPAM 1685 o fc41faf45288 (draft): SPAM SPAM SPAM
1686 | 1686 |
1687 x 2a2b36e14660 (draft): animals 1687 x 2a2b36e14660 (draft): animals
1688 | 1688 |
1689 @ 682004e81e71 (draft): bathroom stuff 1689 @ 682004e81e71 (draft): bathroom stuff
1690 | 1690 |