comparison tests/test-userguide.t @ 6053:be2008649675

branching: preserve test changes on stable CORE-TEST-OUTPUT-UPDATE: 5ced12cfa41b CORE-TEST-OUTPUT-UPDATE: 5105a9975407
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 12 Oct 2021 10:19:05 +0300
parents 1ac08311ae15
children 36a746dda93a
comparison
equal deleted inserted replaced
6052:1ac08311ae15 6053:be2008649675
19 commit is stripped 19 commit is stripped
20 $ hg commit --amend -u alice -d '1 0' -m 'implement feature Y' 20 $ hg commit --amend -u alice -d '1 0' -m 'implement feature Y'
21 saved backup bundle to $TESTTMP/t/.hg/strip-backup/6e725fd2be6f-42cc74d4-amend.hg (glob) 21 saved backup bundle to $TESTTMP/t/.hg/strip-backup/6e725fd2be6f-42cc74d4-amend.hg (glob)
22 $ hg log -r 23fe4ac6d3f1 22 $ hg log -r 23fe4ac6d3f1
23 abort: unknown revision '23fe4ac6d3f1' 23 abort: unknown revision '23fe4ac6d3f1'
24 [255] 24 [10]
25 $ hg identify -in 25 $ hg identify -in
26 fe0ecd3bd2a4 1 26 fe0ecd3bd2a4 1
27 27
28 enable evolve for safe history modification 28 enable evolve for safe history modification
29 $ cat >> $HGRCPATH <<EOF 29 $ cat >> $HGRCPATH <<EOF
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' was rewritten as: 934359450037 41 abort: hidden revision 'fe0ecd3bd2a4' was rewritten as: 934359450037
42 (use --hidden to access hidden revisions) 42 (use --hidden to access hidden revisions)
43 [255] 43 [10]
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
48 |/ 48 |/