--- a/tests/test-split.t Wed Jun 05 19:45:35 2019 +0200
+++ b/tests/test-split.t Wed Jun 05 17:38:32 2019 +0200
@@ -779,18 +779,9 @@
(remaining changes gathered with unmatched one)
-adding content in files to make sure that it prompt us to select the changes,
-as it won't prompt if a file has no changes at hunk level and passed in cli
-(for more look into hg db72f9f6580e which made it to not prompt "examine changes to fileX"
-for files which are explicitly mentioned by user)
- $ echo sp2 > SPLIT2
- $ echo sp3 > SPLIT3
- $ echo sp4 > SPLIT4
- $ hg amend
-
$ hg split SPLIT2 SPLIT3 << EOF
> y
- > s
+ > n
> c
> EOF
0 files updated, 0 files merged, 3 files removed, 0 files unresolved
@@ -799,18 +790,13 @@
adding SPLIT4
diff --git a/SPLIT2 b/SPLIT2
new file mode 100644
- @@ -0,0 +1,1 @@
- +sp2
- record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y
+ examine changes to 'SPLIT2'? [Ynesfdaq?] y
diff --git a/SPLIT3 b/SPLIT3
new file mode 100644
- @@ -0,0 +1,1 @@
- +sp3
- record change 2/2 to 'SPLIT3'? [Ynesfdaq?] s
+ examine changes to 'SPLIT3'? [Ynesfdaq?] n
continue splitting? [Ycdq?] c
-
$ hg status --change '.~1'
A SPLIT2
$ hg status --change '.'
@@ -824,7 +810,7 @@
$ hg split SPLIT2 SPLIT3 << EOF
> y
- > s
+ > n
> y
> y
> EOF
@@ -834,25 +820,18 @@
adding SPLIT4
diff --git a/SPLIT2 b/SPLIT2
new file mode 100644
- @@ -0,0 +1,1 @@
- +sp2
- record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y
+ examine changes to 'SPLIT2'? [Ynesfdaq?] y
diff --git a/SPLIT3 b/SPLIT3
new file mode 100644
- @@ -0,0 +1,1 @@
- +sp3
- record change 2/2 to 'SPLIT3'? [Ynesfdaq?] s
+ examine changes to 'SPLIT3'? [Ynesfdaq?] n
continue splitting? [Ycdq?] y
diff --git a/SPLIT3 b/SPLIT3
new file mode 100644
- @@ -0,0 +1,1 @@
- +sp3
- record this change to 'SPLIT3'? [Ynesfdaq?] y
+ examine changes to 'SPLIT3'? [Ynesfdaq?] y
no more change to split
-
$ hg status --change '.~2'
A SPLIT2
$ hg status --change '.~1'
@@ -875,15 +854,11 @@
adding SPLIT4
diff --git a/SPLIT2 b/SPLIT2
new file mode 100644
- @@ -0,0 +1,1 @@
- +sp2
- record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y
+ examine changes to 'SPLIT2'? [Ynesfdaq?] y
diff --git a/SPLIT3 b/SPLIT3
new file mode 100644
- @@ -0,0 +1,1 @@
- +sp3
- record change 2/2 to 'SPLIT3'? [Ynesfdaq?] y
+ examine changes to 'SPLIT3'? [Ynesfdaq?] y
no more change to split
$ hg status --change '.~1'
@@ -899,7 +874,7 @@
$ hg split SPLIT2 SPLIT3 << EOF
> y
- > s
+ > n
> d
> EOF
0 files updated, 0 files merged, 3 files removed, 0 files unresolved
@@ -908,15 +883,11 @@
adding SPLIT4
diff --git a/SPLIT2 b/SPLIT2
new file mode 100644
- @@ -0,0 +1,1 @@
- +sp2
- record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y
+ examine changes to 'SPLIT2'? [Ynesfdaq?] y
diff --git a/SPLIT3 b/SPLIT3
new file mode 100644
- @@ -0,0 +1,1 @@
- +sp3
- record change 2/2 to 'SPLIT3'? [Ynesfdaq?] s
+ examine changes to 'SPLIT3'? [Ynesfdaq?] n
continue splitting? [Ycdq?] d
discarding remaining changes