comparison tests/test-evolve-templates.t @ 4224:12b026c49fdf mercurial-4.7

test-compat: merge stable into mercurial-4.7
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 09 Nov 2018 20:18:55 +0100
parents f555039d1a08
children 2a7f89817540 2cbb9914d227
comparison
equal deleted inserted replaced
4223:4a3d588e5311 4224:12b026c49fdf
1002 adding manifests 1002 adding manifests
1003 adding file changes 1003 adding file changes
1004 added 1 changesets with 0 changes to 1 files (+1 heads) 1004 added 1 changesets with 0 changes to 1 files (+1 heads)
1005 2 new obsolescence markers 1005 2 new obsolescence markers
1006 obsoleted 1 changesets 1006 obsoleted 1 changesets
1007 new changesets 7a230b46bf61 (1 drafts) 1007 new changesets 7a230b46bf61
1008 (run 'hg heads' to see heads, 'hg merge' to merge) 1008 (run 'hg heads' to see heads, 'hg merge' to merge)
1009 working directory parent is obsolete! (471f378eab4c) 1009 working directory parent is obsolete! (471f378eab4c)
1010 (use 'hg evolve' to update to its successor: 7a230b46bf61) 1010 (use 'hg evolve' to update to its successor: 7a230b46bf61)
1011 $ hg log --hidden -G 1011 $ hg log --hidden -G
1012 o changeset: 2:7a230b46bf61 1012 o changeset: 2:7a230b46bf61