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