comparison tests/test-userguide.t @ 3663:54a469cd5b26

test: update output to match upstream The exact wording for filtered error has been changed. CORE-TEST-OUTPUT-UPDATE: ecd3f6909184
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sun, 15 Apr 2018 23:24:03 +0200
parents d3a17c67f85c
children fbcf9e92097e 96ce1030d2fb
comparison
equal deleted inserted replaced
3662:0caa27259800 3663:54a469cd5b26
36 36
37 example 3: safe amend with "hg commit --amend" (figure 2) 37 example 3: safe amend with "hg commit --amend" (figure 2)
38 $ echo 'tweak feature Y' >> file1.c 38 $ echo 'tweak feature Y' >> file1.c
39 $ hg commit --amend -u alice -d '2 0' -m 'implement feature Y' 39 $ hg commit --amend -u alice -d '2 0' -m 'implement feature Y'
40 $ hg shortlog -q -r fe0ecd3bd2a4 40 $ hg shortlog -q -r fe0ecd3bd2a4
41 abort: hidden revision 'fe0ecd3bd2a4'! 41 abort: hidden revision 'fe0ecd3bd2a4' was rewritten as: 934359450037!
42 (use --hidden to access hidden revisions; successor: 934359450037) 42 (use --hidden to access hidden revisions)
43 [255] 43 [255]
44 $ hg --hidden shortlog -G 44 $ hg --hidden shortlog -G
45 @ 2:934359450037 draft implement feature Y 45 @ 2:934359450037 draft implement feature Y
46 | 46 |
47 | x 1:fe0ecd3bd2a4 draft implement feature Y 47 | x 1:fe0ecd3bd2a4 draft implement feature Y