Mercurial > evolve

comparison tests/test-uncommit-interactive.t @ 3105:f5d472b7e800 mercurial-4.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: revert output changes related to temporary amend commit This backed out changeset 06844693bb21 and other related changes.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 20 Oct 2017 19:32:18 +0200
parents 975f5f42a877
children a867d59ea97a
comparison
equal deleted inserted replaced
3104:3dd5a6f83f8b 3105:f5d472b7e800
300 300
301 Push the changes back to the commit and more commits for more testing 301 Push the changes back to the commit and more commits for more testing
302 302
303 $ hg amend 303 $ hg amend
304 $ glog 304 $ glog
305 @ 6:905eb2a23ea2@default(draft) another one 305 @ 7:905eb2a23ea2@default(draft) another one
306 | 306 |
307 o 0:7733902a8d94@default(draft) The base commit 307 o 0:7733902a8d94@default(draft) The base commit
308 308
309 $ touch foo 309 $ touch foo
310 $ echo "hey" >> foo 310 $ echo "hey" >> foo
443 1 changesets pruned 443 1 changesets pruned
444 $ hg revert --all 444 $ hg revert --all
445 undeleting a 445 undeleting a
446 446
447 $ glog 447 $ glog
448 @ 10:42cc15efbec2@default(draft) Added foo 448 @ 12:42cc15efbec2@default(draft) Added foo
449 | 449 |
450 o 6:905eb2a23ea2@default(draft) another one 450 o 7:905eb2a23ea2@default(draft) another one
451 | 451 |
452 o 0:7733902a8d94@default(draft) The base commit 452 o 0:7733902a8d94@default(draft) The base commit
453 453
454 454
455 Testing when a new file is added in the last commit 455 Testing when a new file is added in the last commit
515 515
516 Testing between the stack and with dirty working copy 516 Testing between the stack and with dirty working copy
517 ===================================================== 517 =====================================================
518 518
519 $ glog 519 $ glog
520 @ 16:25a080d13cb2@default(draft) Added x 520 @ 18:25a080d13cb2@default(draft) Added x
521 | 521 |
522 o 10:42cc15efbec2@default(draft) Added foo 522 o 12:42cc15efbec2@default(draft) Added foo
523 | 523 |
524 o 6:905eb2a23ea2@default(draft) another one 524 o 7:905eb2a23ea2@default(draft) another one
525 | 525 |
526 o 0:7733902a8d94@default(draft) The base commit 526 o 0:7733902a8d94@default(draft) The base commit
527 527
528 $ hg up 905eb2a23ea2 528 $ hg up 905eb2a23ea2
529 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 529 0 files updated, 0 files merged, 2 files removed, 0 files unresolved