tests/test-uncommit-interactive.t
changeset 3563 d4c457c1ae0d
parent 3223 73b4e84df0bd
child 3591 98941c28f3e2
child 4363 a2fdbece7ce1
child 4499 90f94231db5d
equal deleted inserted replaced
3562:fe16284cd95a 3563:d4c457c1ae0d
   166 
   166 
   167   $ hg obslog
   167   $ hg obslog
   168   @  678a59e5ff90 (3) another one
   168   @  678a59e5ff90 (3) another one
   169   |
   169   |
   170   x  f70fb463d5bf (1) another one
   170   x  f70fb463d5bf (1) another one
   171        rewritten(content) as 678a59e5ff90 by test (Thu Jan 01 00:00:00 1970 +0000)
   171        rewritten(content) as 678a59e5ff90 using uncommit by test (Thu Jan 01 00:00:00 1970 +0000)
   172          note: note on amend --extract
   172          note: note on amend --extract
   173   
   173   
   174 The unselected part should be in the diff
   174 The unselected part should be in the diff
   175 -----------------------------------------
   175 -----------------------------------------
   176 
   176 
   298 
   298 
   299   $ hg obslog
   299   $ hg obslog
   300   @  46e35360be47 (5) another one
   300   @  46e35360be47 (5) another one
   301   |
   301   |
   302   x  678a59e5ff90 (3) another one
   302   x  678a59e5ff90 (3) another one
   303   |    rewritten(content) as 46e35360be47 by test (Thu Jan 01 00:00:00 1970 +0000)
   303   |    rewritten(content) as 46e35360be47 using uncommit by test (Thu Jan 01 00:00:00 1970 +0000)
   304   |      note: testing uncommit on dirty wdir
   304   |      note: testing uncommit on dirty wdir
   305   |
   305   |
   306   x  f70fb463d5bf (1) another one
   306   x  f70fb463d5bf (1) another one
   307        rewritten(content) as 678a59e5ff90 by test (Thu Jan 01 00:00:00 1970 +0000)
   307        rewritten(content) as 678a59e5ff90 using uncommit by test (Thu Jan 01 00:00:00 1970 +0000)
   308          note: note on amend --extract
   308          note: note on amend --extract
   309   
   309   
   310 
   310 
   311 Push the changes back to the commit and more commits for more testing
   311 Push the changes back to the commit and more commits for more testing
   312 
   312