tests/test-uncommit-interactive.t
branchmercurial-5.0
changeset 5364 be5aa681c122
parent 5159 e5fe3ca5e6ad
parent 5349 e8660b28bfee
child 5365 f7b4b6698e91
--- a/tests/test-uncommit-interactive.t	Wed Apr 08 01:16:54 2020 +0800
+++ b/tests/test-uncommit-interactive.t	Fri May 08 20:36:29 2020 +0800
@@ -164,12 +164,15 @@
   discard change 3/3 to 'a'? [Ynesfdaq?] n
   
 
+  $ hg debugobsolete
+  e9635f4beaf11f64a07ccc74684092b144c53d89 0 {7733902a8d94c789ca81d866bea1893d79442db6} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'uncommit', 'user': 'test'}
+  f70fb463d5bf9f0ffd38f105521d96e9f2591bc1 678a59e5ff90754d5e94719bd82ad169be773c21 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'note': 'note on amend --extract', 'operation': 'uncommit', 'user': 'test'}
   $ hg obslog
   @  678a59e5ff90 (3) another one
+  |    amended(content) from f70fb463d5bf using uncommit by test (Thu Jan 01 00:00:00 1970 +0000)
+  |      note: note on amend --extract
   |
   x  f70fb463d5bf (1) another one
-       amended(content) as 678a59e5ff90 using uncommit by test (Thu Jan 01 00:00:00 1970 +0000)
-         note: note on amend --extract
   
 The unselected part should be in the diff
 -----------------------------------------
@@ -296,16 +299,21 @@
 
 Checking the obsolescence history
 
+  $ hg debugobsolete
+  e9635f4beaf11f64a07ccc74684092b144c53d89 0 {7733902a8d94c789ca81d866bea1893d79442db6} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'uncommit', 'user': 'test'}
+  f70fb463d5bf9f0ffd38f105521d96e9f2591bc1 678a59e5ff90754d5e94719bd82ad169be773c21 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'note': 'note on amend --extract', 'operation': 'uncommit', 'user': 'test'}
+  7ca9935a62f11b39b60c7fb8861377c7d45b3e99 0 {7733902a8d94c789ca81d866bea1893d79442db6} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'uncommit', 'user': 'test'}
+  678a59e5ff90754d5e94719bd82ad169be773c21 46e35360be473bf761bedf3d05de4a68ffd9d9f8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'note': 'testing uncommit on dirty wdir', 'operation': 'uncommit', 'user': 'test'}
   $ hg obslog
   @  46e35360be47 (5) another one
+  |    amended(content) from 678a59e5ff90 using uncommit by test (Thu Jan 01 00:00:00 1970 +0000)
+  |      note: testing uncommit on dirty wdir
   |
   x  678a59e5ff90 (3) another one
-  |    amended(content) as 46e35360be47 using uncommit by test (Thu Jan 01 00:00:00 1970 +0000)
-  |      note: testing uncommit on dirty wdir
+  |    amended(content) from f70fb463d5bf using uncommit by test (Thu Jan 01 00:00:00 1970 +0000)
+  |      note: note on amend --extract
   |
   x  f70fb463d5bf (1) another one
-       amended(content) as 678a59e5ff90 using uncommit by test (Thu Jan 01 00:00:00 1970 +0000)
-         note: note on amend --extract
   
 
 Push the changes back to the commit and more commits for more testing