Mercurial > evolve

comparison tests/test-userguide.t @ 5709:d0f73113fcc0 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: remove trailing "!" from abort messages CORE-TEST-OUTPUT-UPDATE: 95c4cca641f6 CORE-TEST-OUTPUT-UPDATE: 50afeeeb7b79 CORE-TEST-OUTPUT-UPDATE: 122f0b59f5f0 CORE-TEST-OUTPUT-UPDATE: ca39c45014fa
author Anton Shestakov <av6@dwimlabs.net>
date Wed, 02 Dec 2020 09:40:33 +0800
parents c9798965b1f4
children 08c30eef85d3 6d29d97f4853
comparison
equal deleted inserted replaced
5708:fdc540a9b94b 5709:d0f73113fcc0
18 example 2: unsafe amend with plain vanilla Mercurial: the original 18 example 2: unsafe amend with plain vanilla Mercurial: the original
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 [255]
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
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' 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 [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 |