--- a/tests/test-uncommit-interactive.t Fri Feb 28 23:10:48 2020 +0700
+++ b/tests/test-uncommit-interactive.t Fri Feb 28 23:18:48 2020 +0700
@@ -41,8 +41,7 @@
> EOF
diff --git a/a b/a
new file mode 100644
- examine changes to 'a'?
- (enter ? for help) [Ynesfdaq?] q
+ examine changes to 'a'? [Ynesfdaq?] q
abort: user quit
[255]
@@ -95,8 +94,7 @@
> EOF
diff --git a/a b/a
3 hunks, 6 lines changed
- examine changes to 'a'?
- (enter ? for help) [Ynesfdaq?] y
+ examine changes to 'a'? [Ynesfdaq?] y
@@ -1,3 +1,6 @@
+-2
@@ -105,8 +103,7 @@
1
2
3
- discard change 1/3 to 'a'?
- (enter ? for help) [Ynesfdaq?] n
+ discard change 1/3 to 'a'? [Ynesfdaq?] n
@@ -1,5 +4,7 @@
1
@@ -116,15 +113,13 @@
+bar
4
5
- discard change 2/3 to 'a'?
- (enter ? for help) [Ynesfdaq?] n
+ discard change 2/3 to 'a'? [Ynesfdaq?] n
@@ -4,2 +9,3 @@
4
5
+babar
- discard change 3/3 to 'a'?
- (enter ? for help) [Ynesfdaq?] n
+ discard change 3/3 to 'a'? [Ynesfdaq?] n
abort: nothing selected to uncommit
[255]
@@ -141,8 +136,7 @@
> EOF
diff --git a/a b/a
3 hunks, 6 lines changed
- examine changes to 'a'?
- (enter ? for help) [Ynesfdaq?] y
+ examine changes to 'a'? [Ynesfdaq?] y
@@ -1,3 +1,6 @@
+-2
@@ -151,8 +145,7 @@
1
2
3
- discard change 1/3 to 'a'?
- (enter ? for help) [Ynesfdaq?] y
+ discard change 1/3 to 'a'? [Ynesfdaq?] y
@@ -1,5 +4,7 @@
1
@@ -162,15 +155,13 @@
+bar
4
5
- discard change 2/3 to 'a'?
- (enter ? for help) [Ynesfdaq?] n
+ discard change 2/3 to 'a'? [Ynesfdaq?] n
@@ -4,2 +9,3 @@
4
5
+babar
- discard change 3/3 to 'a'?
- (enter ? for help) [Ynesfdaq?] n
+ discard change 3/3 to 'a'? [Ynesfdaq?] n
$ hg obslog
@@ -244,8 +235,7 @@
> EOF
diff --git a/a b/a
2 hunks, 3 lines changed
- examine changes to 'a'?
- (enter ? for help) [Ynesfdaq?] y
+ examine changes to 'a'? [Ynesfdaq?] y
@@ -1,5 +1,7 @@
1
@@ -255,15 +245,13 @@
+bar
4
5
- discard change 1/2 to 'a'?
- (enter ? for help) [Ynesfdaq?] n
+ discard change 1/2 to 'a'? [Ynesfdaq?] n
@@ -4,2 +6,3 @@
4
5
+babar
- discard change 2/2 to 'a'?
- (enter ? for help) [Ynesfdaq?] y
+ discard change 2/2 to 'a'? [Ynesfdaq?] y
patching file a
Hunk #1 succeeded at 2 with fuzz 1 (offset 0 lines).
@@ -342,13 +330,11 @@
> EOF
diff --git a/foo b/foo
new file mode 100644
- examine changes to 'foo'?
- (enter ? for help) [Ynesfdaq?] y
+ examine changes to 'foo'? [Ynesfdaq?] y
@@ -0,0 +1,1 @@
+hey
- discard this change to 'foo'?
- (enter ? for help) [Ynesfdaq?] y
+ discard this change to 'foo'? [Ynesfdaq?] y
new changeset is empty
(use 'hg prune .' to remove it)
@@ -411,8 +397,7 @@
> EOF
diff --git a/a b/a
deleted file mode 100644
- examine changes to 'a'?
- (enter ? for help) [Ynesfdaq?] n
+ examine changes to 'a'? [Ynesfdaq?] n
abort: nothing selected to uncommit
[255]
@@ -429,8 +414,7 @@
> EOF
diff --git a/a b/a
deleted file mode 100644
- examine changes to 'a'?
- (enter ? for help) [Ynesfdaq?] y
+ examine changes to 'a'? [Ynesfdaq?] y
new changeset is empty
(use 'hg prune .' to remove it)
@@ -494,24 +478,20 @@
> EOF
diff --git a/foo b/foo
1 hunks, 1 lines changed
- examine changes to 'foo'?
- (enter ? for help) [Ynesfdaq?] y
+ examine changes to 'foo'? [Ynesfdaq?] y
@@ -1,1 +1,2 @@
hey
+foo
- discard change 1/2 to 'foo'?
- (enter ? for help) [Ynesfdaq?] y
+ discard change 1/2 to 'foo'? [Ynesfdaq?] y
diff --git a/x b/x
new file mode 100644
- examine changes to 'x'?
- (enter ? for help) [Ynesfdaq?] y
+ examine changes to 'x'? [Ynesfdaq?] y
@@ -0,0 +1,1 @@
+abcd
- discard change 2/2 to 'x'?
- (enter ? for help) [Ynesfdaq?] n
+ discard change 2/2 to 'x'? [Ynesfdaq?] n
$ hg exp
@@ -598,8 +578,7 @@
> EOF
diff --git a/a b/a
3 hunks, 6 lines changed
- examine changes to 'a'?
- (enter ? for help) [Ynesfdaq?] y
+ examine changes to 'a'? [Ynesfdaq?] y
@@ -1,3 +1,6 @@
+-2
@@ -608,8 +587,7 @@
1
2
3
- discard change 1/3 to 'a'?
- (enter ? for help) [Ynesfdaq?] n
+ discard change 1/3 to 'a'? [Ynesfdaq?] n
@@ -1,5 +4,7 @@
1
@@ -619,15 +597,13 @@
+bar
4
5
- discard change 2/3 to 'a'?
- (enter ? for help) [Ynesfdaq?] n
+ discard change 2/3 to 'a'? [Ynesfdaq?] n
@@ -4,2 +9,3 @@
4
5
+babar
- discard change 3/3 to 'a'?
- (enter ? for help) [Ynesfdaq?] y
+ discard change 3/3 to 'a'? [Ynesfdaq?] y
patching file a
Hunk #1 succeeded at 1 with fuzz 1 (offset -1 lines).
@@ -686,8 +662,7 @@
> EOF
diff --git a/a b/a
2 hunks, 5 lines changed
- examine changes to 'a'?
- (enter ? for help) [Ynesfdaq?] y
+ examine changes to 'a'? [Ynesfdaq?] y
@@ -1,3 +1,6 @@
+-2
@@ -696,8 +671,7 @@
1
2
3
- discard change 1/2 to 'a'?
- (enter ? for help) [Ynesfdaq?] y
+ discard change 1/2 to 'a'? [Ynesfdaq?] y
@@ -1,5 +4,7 @@
1
@@ -707,8 +681,7 @@
+bar
4
5
- discard change 2/2 to 'a'?
- (enter ? for help) [Ynesfdaq?] n
+ discard change 2/2 to 'a'? [Ynesfdaq?] n
$ hg exp
@@ -815,8 +788,7 @@
5
babar
+celeste
- discard this change to 'a'?
- (enter ? for help) [Ynesfdaq?] y
+ discard this change to 'a'? [Ynesfdaq?] y
$ hg status
M a
@@ -880,16 +852,14 @@
-2
-1
0
- discard change 1/2 to 'a'?
- (enter ? for help) [Ynesfdaq?] y
+ discard change 1/2 to 'a'? [Ynesfdaq?] y
@@ -9,3 +10,4 @@
4
5
babar
+celeste
- discard change 2/2 to 'a'?
- (enter ? for help) [Ynesfdaq?] n
+ discard change 2/2 to 'a'? [Ynesfdaq?] n
$ hg status
M a