comparison tests/test-tutorial.t @ 4552:0eb80259f9cb mercurial-4.4

test-compat: merge mercurial-4.5 into mercurial-4.4
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sat, 20 Apr 2019 03:55:11 +0200
parents a2fdbece7ce1
children 79bc0f1a832e
comparison
equal deleted inserted replaced
4551:7de160f6c7a9 4552:0eb80259f9cb
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)
1217 1216
1218 The new changeset "animal" is based on an old changeset of "bathroom". You can 1217 The new changeset "animal" is based on an old changeset of "bathroom". You can
1219 see both version showing up in the log. 1218 see both version showing up in the log.
1220 1219
1221 $ hg log -G 1220 $ hg log -G
1222 * e4e4fa805d92 (draft): animals 1221 o e4e4fa805d92 (draft): animals
1223 | 1222 |
1224 | @ 682004e81e71 (draft): bathroom stuff 1223 | @ 682004e81e71 (draft): bathroom stuff
1225 | | 1224 | |
1226 x | 4710c0968793 (draft): bathroom stuff 1225 x | 4710c0968793 (draft): bathroom stuff
1227 |/ 1226 |/
1673 1672
1674 $ hg prune 2a2b36e14660 1673 $ hg prune 2a2b36e14660
1675 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1674 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1676 working directory now at 682004e81e71 1675 working directory now at 682004e81e71
1677 1 changesets pruned 1676 1 changesets pruned
1678 1 new orphan changesets
1679 1677
1680 1678
1681 The animals changeset is still displayed because the "SPAM SPAM SPAM" changeset 1679 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. 1680 is neither dead or obsolete. My repository is in an unstable state again.
1683 1681
1684 $ hg log -G 1682 $ hg log -G
1685 * fc41faf45288 (draft): SPAM SPAM SPAM 1683 o fc41faf45288 (draft): SPAM SPAM SPAM
1686 | 1684 |
1687 x 2a2b36e14660 (draft): animals 1685 x 2a2b36e14660 (draft): animals
1688 | 1686 |
1689 @ 682004e81e71 (draft): bathroom stuff 1687 @ 682004e81e71 (draft): bathroom stuff
1690 | 1688 |