Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-split.t
changeset 4499 90f94231db5d
parent 4455 b58e45aa9be2
child 4502 84512556e148
child 4576 96ce1030d2fb 
--- a/tests/test-split.t	Wed Apr 10 21:03:56 2019 +0200
+++ b/tests/test-split.t	Wed Apr 10 23:19:29 2019 +0530
@@ -779,9 +779,18 @@
 
 (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
-  > n
+  > s
   > c
   > EOF
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
@@ -790,13 +799,18 @@
   adding SPLIT4
   diff --git a/SPLIT2 b/SPLIT2
   new file mode 100644
-  examine changes to 'SPLIT2'? [Ynesfdaq?] y
+  @@ -0,0 +1,1 @@
+  +sp2
+  record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y
   
   diff --git a/SPLIT3 b/SPLIT3
   new file mode 100644
-  examine changes to 'SPLIT3'? [Ynesfdaq?] n
+  @@ -0,0 +1,1 @@
+  +sp3
+  record change 2/2 to 'SPLIT3'? [Ynesfdaq?] s
   
   continue splitting? [Ycdq?] c
+
   $ hg status --change '.~1'
   A SPLIT2
   $ hg status --change '.'
@@ -810,7 +824,7 @@
 
   $ hg split SPLIT2 SPLIT3 << EOF
   > y
-  > n
+  > s
   > y
   > y
   > EOF
@@ -820,18 +834,25 @@
   adding SPLIT4
   diff --git a/SPLIT2 b/SPLIT2
   new file mode 100644
-  examine changes to 'SPLIT2'? [Ynesfdaq?] y
+  @@ -0,0 +1,1 @@
+  +sp2
+  record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y
   
   diff --git a/SPLIT3 b/SPLIT3
   new file mode 100644
-  examine changes to 'SPLIT3'? [Ynesfdaq?] n
+  @@ -0,0 +1,1 @@
+  +sp3
+  record change 2/2 to 'SPLIT3'? [Ynesfdaq?] s
   
   continue splitting? [Ycdq?] y
   diff --git a/SPLIT3 b/SPLIT3
   new file mode 100644
-  examine changes to 'SPLIT3'? [Ynesfdaq?] y
+  @@ -0,0 +1,1 @@
+  +sp3
+  record this change to 'SPLIT3'? [Ynesfdaq?] y
   
   no more change to split
+
   $ hg status --change '.~2'
   A SPLIT2
   $ hg status --change '.~1'
@@ -854,11 +875,15 @@
   adding SPLIT4
   diff --git a/SPLIT2 b/SPLIT2
   new file mode 100644
-  examine changes to 'SPLIT2'? [Ynesfdaq?] y
+  @@ -0,0 +1,1 @@
+  +sp2
+  record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y
   
   diff --git a/SPLIT3 b/SPLIT3
   new file mode 100644
-  examine changes to 'SPLIT3'? [Ynesfdaq?] y
+  @@ -0,0 +1,1 @@
+  +sp3
+  record change 2/2 to 'SPLIT3'? [Ynesfdaq?] y
   
   no more change to split
   $ hg status --change '.~1'
@@ -874,7 +899,7 @@
 
   $ hg split SPLIT2 SPLIT3 << EOF
   > y
-  > n
+  > s
   > d
   > EOF
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
@@ -883,11 +908,15 @@
   adding SPLIT4
   diff --git a/SPLIT2 b/SPLIT2
   new file mode 100644
-  examine changes to 'SPLIT2'? [Ynesfdaq?] y
+  @@ -0,0 +1,1 @@
+  +sp2
+  record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y
   
   diff --git a/SPLIT3 b/SPLIT3
   new file mode 100644
-  examine changes to 'SPLIT3'? [Ynesfdaq?] n
+  @@ -0,0 +1,1 @@
+  +sp3
+  record change 2/2 to 'SPLIT3'? [Ynesfdaq?] s
   
   continue splitting? [Ycdq?] d
   discarding remaining changes
evolve