Show More
@@ -20,6 +20,8 b'' | |||||
20 | > split= |
|
20 | > split= | |
21 | > [ui] |
|
21 | > [ui] | |
22 | > interactive=1 |
|
22 | > interactive=1 | |
|
23 | > color=no | |||
|
24 | > paginate=never | |||
23 | > [diff] |
|
25 | > [diff] | |
24 | > git=1 |
|
26 | > git=1 | |
25 | > unified=0 |
|
27 | > unified=0 | |
@@ -57,9 +59,10 b' Cannot split working directory' | |||||
57 | abort: cannot split working directory |
|
59 | abort: cannot split working directory | |
58 | [255] |
|
60 | [255] | |
59 |
|
61 | |||
60 | Generate some content |
|
62 | Generate some content. The sed filter drop CR on Windows, which is dropped in | |
|
63 | the a > b line. | |||
61 |
|
64 | |||
62 | $ $TESTDIR/seq.py 1 5 >> a |
|
65 | $ $TESTDIR/seq.py 1 5 | sed 's/\r$//' >> a | |
63 | $ hg ci -m a1 -A a -q |
|
66 | $ hg ci -m a1 -A a -q | |
64 | $ hg bookmark -i r1 |
|
67 | $ hg bookmark -i r1 | |
65 | $ sed 's/1/11/;s/3/33/;s/5/55/' a > b |
|
68 | $ sed 's/1/11/;s/3/33/;s/5/55/' a > b | |
@@ -132,7 +135,7 b' Split a head' | |||||
132 | [255] |
|
135 | [255] | |
133 | $ hg status |
|
136 | $ hg status | |
134 |
|
137 | |||
135 | $ HGEDITOR="$PYTHON $TESTTMP/editor.py" |
|
138 | $ HGEDITOR="\"$PYTHON\" $TESTTMP/editor.py" | |
136 | $ runsplit |
|
139 | $ runsplit | |
137 | diff --git a/a b/a |
|
140 | diff --git a/a b/a | |
138 | 1 hunks, 1 lines changed |
|
141 | 1 hunks, 1 lines changed | |
@@ -197,7 +200,7 b' Split a head' | |||||
197 | EDITOR: HG: user: test |
|
200 | EDITOR: HG: user: test | |
198 | EDITOR: HG: branch 'default' |
|
201 | EDITOR: HG: branch 'default' | |
199 | EDITOR: HG: changed a |
|
202 | EDITOR: HG: changed a | |
200 |
saved backup bundle to $TESTTMP/a/.hg/strip-backup/1df0d5c5a3ab-8341b760-split.hg ( |
|
203 | saved backup bundle to $TESTTMP/a/.hg/strip-backup/1df0d5c5a3ab-8341b760-split.hg (obsstore-off !) | |
201 |
|
204 | |||
202 | #if obsstore-off |
|
205 | #if obsstore-off | |
203 | $ hg bookmark |
|
206 | $ hg bookmark |
General Comments 0
You need to be logged in to leave comments.
Login now