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 4712 e2c548cc83b5
parent 4613 30a544904238
child 4777 ff452675566c
child 5234 ea3f9e171b9a 
--- a/tests/test-split.t	Thu Jul 11 10:07:39 2019 +0200
+++ b/tests/test-split.t	Tue Jul 09 21:49:37 2019 -0700
@@ -68,29 +68,35 @@
   adding _d
   diff --git a/_a b/_a
   1 hunks, 1 lines changed
-  examine changes to '_a'? [Ynesfdaq?] y
+  examine changes to '_a'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -1,0 +2,1 @@
   +change to a
-  record change 1/2 to '_a'? [Ynesfdaq?] y
+  record change 1/2 to '_a'?
+  (enter ? for help) [Ynesfdaq?] y
   
   diff --git a/_d b/_d
   new file mode 100644
-  examine changes to '_d'? [Ynesfdaq?] y
+  examine changes to '_d'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -0,0 +1,1 @@
   +_d
-  record change 2/2 to '_d'? [Ynesfdaq?] n
+  record change 2/2 to '_d'?
+  (enter ? for help) [Ynesfdaq?] n
   
   created new head
   continue splitting? [Ycdq?] Y
   diff --git a/_d b/_d
   new file mode 100644
-  examine changes to '_d'? [Ynesfdaq?] y
+  examine changes to '_d'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -0,0 +1,1 @@
   +_d
-  record this change to '_d'? [Ynesfdaq?] y
+  record this change to '_d'?
+  (enter ? for help) [Ynesfdaq?] y
   
   no more change to split
 
@@ -190,19 +196,23 @@
   adding _c
   diff --git a/_b b/_b
   1 hunks, 1 lines changed
-  examine changes to '_b'? [Ynesfdaq?] y
+  examine changes to '_b'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -1,0 +2,1 @@
   +change to b
-  record change 1/2 to '_b'? [Ynesfdaq?] y
+  record change 1/2 to '_b'?
+  (enter ? for help) [Ynesfdaq?] y
   
   diff --git a/_c b/_c
   new file mode 100644
-  examine changes to '_c'? [Ynesfdaq?] y
+  examine changes to '_c'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -0,0 +1,1 @@
   +_c
-  record change 2/2 to '_c'? [Ynesfdaq?] n
+  record change 2/2 to '_c'?
+  (enter ? for help) [Ynesfdaq?] n
   
   created new head
   continue splitting? [Ycdq?] c
@@ -293,17 +303,20 @@
   adding _d
   diff --git a/_a b/_a
   1 hunks, 2 lines changed
-  examine changes to '_a'? [Ynesfdaq?] y
+  examine changes to '_a'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -1,2 +1,1 @@
   -_a
   -change to a
   +changetofilea
-  record change 1/2 to '_a'? [Ynesfdaq?] y
+  record change 1/2 to '_a'?
+  (enter ? for help) [Ynesfdaq?] y
   
   diff --git a/_d b/_d
   new file mode 100644
-  examine changes to '_d'? [Ynesfdaq?] n
+  examine changes to '_d'?
+  (enter ? for help) [Ynesfdaq?] n
   
   created new head
   continue splitting? [Ycdq?] c
@@ -338,7 +351,8 @@
   adding _d
   diff --git a/_d b/_d
   new file mode 100644
-  examine changes to '_d'? [Ynesfdaq?] abort: response expected
+  examine changes to '_d'?
+  (enter ? for help) [Ynesfdaq?] abort: response expected
   [255]
 
 Cannot split a commit that is not a head if instability is not allowed
@@ -364,7 +378,8 @@
   adding _d
   diff --git a/_d b/_d
   new file mode 100644
-  examine changes to '_d'? [Ynesfdaq?] q
+  examine changes to '_d'?
+  (enter ? for help) [Ynesfdaq?] q
   
   abort: user quit
   [255]
@@ -377,7 +392,8 @@
   adding _d
   diff --git a/_d b/_d
   new file mode 100644
-  examine changes to '_d'? [Ynesfdaq?] q
+  examine changes to '_d'?
+  (enter ? for help) [Ynesfdaq?] q
   
   abort: user quit
   [255]
@@ -447,15 +463,18 @@
   adding celeste
   diff --git a/babar b/babar
   new file mode 100644
-  examine changes to 'babar'? [Ynesfdaq?] Y
+  examine changes to 'babar'?
+  (enter ? for help) [Ynesfdaq?] Y
   
   @@ -0,0 +1,1 @@
   +babar
-  record change 1/2 to 'babar'? [Ynesfdaq?] Y
+  record change 1/2 to 'babar'?
+  (enter ? for help) [Ynesfdaq?] Y
   
   diff --git a/celeste b/celeste
   new file mode 100644
-  examine changes to 'celeste'? [Ynesfdaq?] N
+  examine changes to 'celeste'?
+  (enter ? for help) [Ynesfdaq?] N
   
   continue splitting? [Ycdq?] c
 
@@ -539,16 +558,19 @@
   adding SPLIT2
   diff --git a/SPLIT1 b/SPLIT1
   new file mode 100644
-  examine changes to 'SPLIT1'? [Ynesfdaq?] Y
+  examine changes to 'SPLIT1'?
+  (enter ? for help) [Ynesfdaq?] Y
   
   diff --git a/SPLIT2 b/SPLIT2
   new file mode 100644
-  examine changes to 'SPLIT2'? [Ynesfdaq?] N
+  examine changes to 'SPLIT2'?
+  (enter ? for help) [Ynesfdaq?] N
   
   continue splitting? [Ycdq?] Y
   diff --git a/SPLIT2 b/SPLIT2
   new file mode 100644
-  examine changes to 'SPLIT2'? [Ynesfdaq?] Y
+  examine changes to 'SPLIT2'?
+  (enter ? for help) [Ynesfdaq?] Y
   
   no more change to split
 
@@ -617,11 +639,13 @@
   adding SPLIT4
   diff --git a/SPLIT3 b/SPLIT3
   new file mode 100644
-  examine changes to 'SPLIT3'? [Ynesfdaq?] Y
+  examine changes to 'SPLIT3'?
+  (enter ? for help) [Ynesfdaq?] Y
   
   diff --git a/SPLIT4 b/SPLIT4
   new file mode 100644
-  examine changes to 'SPLIT4'? [Ynesfdaq?] q
+  examine changes to 'SPLIT4'?
+  (enter ? for help) [Ynesfdaq?] q
   
   abort: user quit
   [255]
@@ -663,11 +687,13 @@
   adding SPLIT4
   diff --git a/SPLIT3 b/SPLIT3
   new file mode 100644
-  examine changes to 'SPLIT3'? [Ynesfdaq?] Y
+  examine changes to 'SPLIT3'?
+  (enter ? for help) [Ynesfdaq?] Y
   
   diff --git a/SPLIT4 b/SPLIT4
   new file mode 100644
-  examine changes to 'SPLIT4'? [Ynesfdaq?] ?
+  examine changes to 'SPLIT4'?
+  (enter ? for help) [Ynesfdaq?] ?
   
   y - yes, record this change
   n - no, skip this change
@@ -678,7 +704,8 @@
   a - record all changes to all remaining files
   q - quit, recording no changes
   ? - ? (display help)
-  examine changes to 'SPLIT4'? [Ynesfdaq?] d
+  examine changes to 'SPLIT4'?
+  (enter ? for help) [Ynesfdaq?] d
   
   continue splitting? [Ycdq?] ?
   y - yes, continue selection
@@ -741,11 +768,13 @@
   adding SPLIT3
   diff --git a/SPLIT2 b/SPLIT2
   new file mode 100644
-  examine changes to 'SPLIT2'? [Ynesfdaq?] Y
+  examine changes to 'SPLIT2'?
+  (enter ? for help) [Ynesfdaq?] Y
   
   diff --git a/SPLIT3 b/SPLIT3
   new file mode 100644
-  examine changes to 'SPLIT3'? [Ynesfdaq?] d
+  examine changes to 'SPLIT3'?
+  (enter ? for help) [Ynesfdaq?] d
   
   continue splitting? [Ycdq?] d
   discarding remaining changes
@@ -801,13 +830,15 @@
   new file mode 100644
   @@ -0,0 +1,1 @@
   +sp2
-  record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y
+  record change 1/2 to 'SPLIT2'?
+  (enter ? for help) [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
+  record change 2/2 to 'SPLIT3'?
+  (enter ? for help) [Ynesfdaq?] s
   
   continue splitting? [Ycdq?] c
 
@@ -836,20 +867,23 @@
   new file mode 100644
   @@ -0,0 +1,1 @@
   +sp2
-  record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y
+  record change 1/2 to 'SPLIT2'?
+  (enter ? for help) [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
+  record change 2/2 to 'SPLIT3'?
+  (enter ? for help) [Ynesfdaq?] s
   
   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
+  record this change to 'SPLIT3'?
+  (enter ? for help) [Ynesfdaq?] y
   
   no more change to split
 
@@ -877,13 +911,15 @@
   new file mode 100644
   @@ -0,0 +1,1 @@
   +sp2
-  record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y
+  record change 1/2 to 'SPLIT2'?
+  (enter ? for help) [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
+  record change 2/2 to 'SPLIT3'?
+  (enter ? for help) [Ynesfdaq?] y
   
   no more change to split
   $ hg status --change '.~1'
@@ -910,13 +946,15 @@
   new file mode 100644
   @@ -0,0 +1,1 @@
   +sp2
-  record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y
+  record change 1/2 to 'SPLIT2'?
+  (enter ? for help) [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
+  record change 2/2 to 'SPLIT3'?
+  (enter ? for help) [Ynesfdaq?] s
   
   continue splitting? [Ycdq?] d
   discarding remaining changes
@@ -1058,26 +1096,31 @@
   adding b
   diff --git a/a b/a
   new file mode 100644
-  examine changes to 'a'? [Ynesfdaq?] y
+  examine changes to 'a'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -0,0 +1,1 @@
   +a
-  record change 1/2 to 'a'? [Ynesfdaq?] y
+  record change 1/2 to 'a'?
+  (enter ? for help) [Ynesfdaq?] y
   
   diff --git a/b b/b
   new file mode 100644
-  examine changes to 'b'? [Ynesfdaq?] n
+  examine changes to 'b'?
+  (enter ? for help) [Ynesfdaq?] n
   
   created new head
   (consider using topic for lightweight branches. See 'hg help topic')
   continue splitting? [Ycdq?] y
   diff --git a/b b/b
   new file mode 100644
-  examine changes to 'b'? [Ynesfdaq?] y
+  examine changes to 'b'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -0,0 +1,1 @@
   +b
-  record this change to 'b'? [Ynesfdaq?] y
+  record this change to 'b'?
+  (enter ? for help) [Ynesfdaq?] y
   
   no more change to split
   1 new orphan changesets
@@ -1200,15 +1243,18 @@
   adding c
   diff --git a/b b/b
   new file mode 100644
-  examine changes to 'b'? [Ynesfdaq?] y
+  examine changes to 'b'?
+  (enter ? for help) [Ynesfdaq?] y
   
   @@ -0,0 +1,1 @@
   +b
-  record change 1/2 to 'b'? [Ynesfdaq?] y
+  record change 1/2 to 'b'?
+  (enter ? for help) [Ynesfdaq?] y
   
   diff --git a/c b/c
   new file mode 100644
-  examine changes to 'c'? [Ynesfdaq?] n
+  examine changes to 'c'?
+  (enter ? for help) [Ynesfdaq?] n
   
   created new head
   (consider using topic for lightweight branches. See 'hg help topic')
evolve