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