--- a/tests/test-uncommit-interactive.t Fri Aug 03 00:19:47 2018 +0200
+++ b/tests/test-uncommit-interactive.t Fri Aug 03 00:22:50 2018 +0200
@@ -134,6 +134,8 @@
> n
> n
> EOF
+ current hg version does not support storing note in obsmarker
+ current hg version does not support storing note in obsmarker
diff --git a/a b/a
3 hunks, 6 lines changed
examine changes to 'a'? [Ynesfdaq?] y
@@ -168,7 +170,7 @@
@ 678a59e5ff90 (3) another one
|
x f70fb463d5bf (1) another one
- rewritten(content) as 678a59e5ff90 using uncommit by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(content) as 678a59e5ff90 by test (Thu Jan 01 00:00:00 1970 +0000)
note: note on amend --extract
The unselected part should be in the diff
@@ -233,6 +235,7 @@
> n
> y
> EOF
+ current hg version does not support storing note in obsmarker
diff --git a/a b/a
2 hunks, 3 lines changed
examine changes to 'a'? [Ynesfdaq?] y
@@ -300,11 +303,11 @@
@ 46e35360be47 (5) another one
|
x 678a59e5ff90 (3) another one
- | rewritten(content) as 46e35360be47 using uncommit by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(content) as 46e35360be47 by test (Thu Jan 01 00:00:00 1970 +0000)
| note: testing uncommit on dirty wdir
|
x f70fb463d5bf (1) another one
- rewritten(content) as 678a59e5ff90 using uncommit by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(content) as 678a59e5ff90 by test (Thu Jan 01 00:00:00 1970 +0000)
note: note on amend --extract
@@ -312,7 +315,7 @@
$ hg amend
$ glog
- @ 6:905eb2a23ea2@default(draft) another one
+ @ 7:905eb2a23ea2@default(draft) another one
|
o 0:7733902a8d94@default(draft) The base commit
@@ -455,9 +458,9 @@
undeleting a
$ glog
- @ 10:42cc15efbec2@default(draft) Added foo
+ @ 12:42cc15efbec2@default(draft) Added foo
|
- o 6:905eb2a23ea2@default(draft) another one
+ o 7:905eb2a23ea2@default(draft) another one
|
o 0:7733902a8d94@default(draft) The base commit
@@ -527,11 +530,11 @@
=====================================================
$ glog
- @ 16:25a080d13cb2@default(draft) Added x
+ @ 18:25a080d13cb2@default(draft) Added x
|
- o 10:42cc15efbec2@default(draft) Added foo
+ o 12:42cc15efbec2@default(draft) Added foo
|
- o 6:905eb2a23ea2@default(draft) another one
+ o 7:905eb2a23ea2@default(draft) another one
|
o 0:7733902a8d94@default(draft) The base commit
@@ -607,7 +610,7 @@
patching file a
Hunk #1 succeeded at 1 with fuzz 1 (offset -1 lines).
- 2 new orphan changesets
+ 2 new unstable changesets
$ hg diff
diff -r 676366511f95 a