comparison tests/test-tutorial.t @ 3411:e1f3e43a50a4 stable

branching: backed out test output changes from core-1905aac253f0 This backs out evolve-ae6fddf39933
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 15 Jan 2018 19:52:00 +0100
parents eacf6149b678
children 85cdce113c2c d3a17c67f85c
comparison
equal deleted inserted replaced
3410:39112fd4d5ed 3411:e1f3e43a50a4
1220 1220
1221 The new changeset "animal" is based on an old changeset of "bathroom". You can 1221 The new changeset "animal" is based on an old changeset of "bathroom". You can
1222 see both version showing up in the log. 1222 see both version showing up in the log.
1223 1223
1224 $ hg log -G 1224 $ hg log -G
1225 * bf1b0d202029 (draft): animals 1225 o bf1b0d202029 (draft): animals
1226 | 1226 |
1227 | @ a44c85f957d3 (draft): bathroom stuff 1227 | @ a44c85f957d3 (draft): bathroom stuff
1228 | | 1228 | |
1229 x | 75954b8cd933 (draft): bathroom stuff 1229 x | 75954b8cd933 (draft): bathroom stuff
1230 |/ 1230 |/
1683 1683
1684 The animals changeset is still displayed because the "SPAM SPAM SPAM" changeset 1684 The animals changeset is still displayed because the "SPAM SPAM SPAM" changeset
1685 is neither dead or obsolete. My repository is in an unstable state again. 1685 is neither dead or obsolete. My repository is in an unstable state again.
1686 1686
1687 $ hg log -G 1687 $ hg log -G
1688 * 99f039c5ec9e (draft): SPAM SPAM SPAM 1688 o 99f039c5ec9e (draft): SPAM SPAM SPAM
1689 | 1689 |
1690 x ee942144f952 (draft): animals 1690 x ee942144f952 (draft): animals
1691 | 1691 |
1692 @ a44c85f957d3 (draft): bathroom stuff 1692 @ a44c85f957d3 (draft): bathroom stuff
1693 | 1693 |