tests/test-uncommit-interactive.t
branchstable
changeset 3088 b3efdd407f30
parent 3013 945a0989e41b
child 3090 975f5f42a877
equal deleted inserted replaced
3077:b76fe277cef2 3088:b3efdd407f30
   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   @  7:905eb2a23ea2@default(draft) another one
   305   @  6: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   @  12:42cc15efbec2@default(draft) Added foo
   448   @  10:42cc15efbec2@default(draft) Added foo
   449   |
   449   |
   450   o  7:905eb2a23ea2@default(draft) another one
   450   o  6: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   @  18:25a080d13cb2@default(draft) Added x
   520   @  16:25a080d13cb2@default(draft) Added x
   521   |
   521   |
   522   o  12:42cc15efbec2@default(draft) Added foo
   522   o  10:42cc15efbec2@default(draft) Added foo
   523   |
   523   |
   524   o  7:905eb2a23ea2@default(draft) another one
   524   o  6: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 7
   528   $ hg up 6
   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
   530 
   530 
   531   $ touch bar
   531   $ touch bar
   532   $ echo "foo" >> bar
   532   $ echo "foo" >> bar
   533   $ hg add bar
   533   $ hg add bar
   595   +babar
   595   +babar
   596   discard change 3/3 to 'a'? [Ynesfdaq?] y
   596   discard change 3/3 to 'a'? [Ynesfdaq?] y
   597   
   597   
   598   patching file a
   598   patching file a
   599   Hunk #1 succeeded at 1 with fuzz 1 (offset -1 lines).
   599   Hunk #1 succeeded at 1 with fuzz 1 (offset -1 lines).
   600   2 new unstable changesets
   600   2 new orphan changesets
   601 
   601 
   602   $ hg diff
   602   $ hg diff
   603   diff -r 676366511f95 a
   603   diff -r 676366511f95 a
   604   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   604   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   605   +++ b/a	Thu Jan 01 00:00:00 1970 +0000
   605   +++ b/a	Thu Jan 01 00:00:00 1970 +0000