Mercurial > evolve
comparison tests/test-userguide.t @ 3924:f3713d41b85b mercurial-4.5
test-compat: merge mercurial-4.6 into mercurial-4.5
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 02 Aug 2018 01:58:44 +0200 |
| parents | fbcf9e92097e |
| children | 19ec729f3ca2 3810ca63398f |
comparison
equal
deleted
inserted
replaced
| 3923:257481642686 | 3924:f3713d41b85b |
|---|---|
| 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'! |
| 42 (use --hidden to access hidden revisions) | 42 (use --hidden to access hidden revisions; successor: 934359450037) |
| 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 |