Mercurial > evolve
comparison tests/test-userguide.t @ 2799:1627153804dc mercurial-4.1
test-compat: merge with mercurial-4.2
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 25 Jul 2017 03:59:22 +0200 |
| parents | 7263463ae79a 2280461343e5 |
| children | 00e4d31b8cdb |
comparison
equal
deleted
inserted
replaced
| 2798:2280461343e5 | 2799:1627153804dc |
|---|---|
| 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'! |
| 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 @ 3:934359450037 draft implement feature Y | 45 @ 3:934359450037 draft implement feature Y |
| 46 | | 46 | |
| 47 | x 2:6c5f78d5d467 draft temporary amend commit for fe0ecd3bd2a4 | 47 | x 2:6c5f78d5d467 draft temporary amend commit for fe0ecd3bd2a4 |