Mercurial > hg
annotate tests/test-split.t @ 40417:49c7b701fdc2 stable
phase: add an archived phase
This phase allows for hidden changesets in the "user space". It differs from
the "internal" phase which is intended for internal by-product only. There
have been discussions at the 4.8 sprint to use such phase to speedup cleanup
after history rewriting operation.
Shipping it in the same release as the 'internal-phase' groups the associated
`requires` entry. The important bit is to have support for this phase in the
earliest version of mercurial possible. Adding the UI to manipulate this new
phase later seems fine.
The current plan for archived usage and user interface are as follow. On a
repository with internal-phase on and evolution off:
* history rewriting command set rewritten changeset in the archived phase.
(This mean updating the cleanupnodes method).
* keep `hg unbundle .hg/strip-backup/X.hg` as a way to restore changeset for
now
(backup bundle need to contains phase data)
* [maybe] add a `hg strip --soft` advance flag
(a light way to expose the feature without getting in the way of a better
UI)
Mercurial 4.8 freeze is too close to get the above in by then.
We don't introduce a new repository `requirement` as we reuse the one
introduced with the 'archived' phase during the 4.8 cycle.
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Wed, 17 Oct 2018 14:47:01 +0200 |
parents | 5abc47d4ca6b |
children | d1d3094b54f9 |
rev | line source |
---|---|
35455 | 1 #testcases obsstore-on obsstore-off |
2 | |
3 $ cat > $TESTTMP/editor.py <<EOF | |
39707
5abc47d4ca6b
tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents:
38424
diff
changeset
|
4 > #!"$PYTHON" |
36645
7bc33d677c0c
tests: fix various test-check-module-imports.t violations
Augie Fackler <augie@google.com>
parents:
35709
diff
changeset
|
5 > import os |
7bc33d677c0c
tests: fix various test-check-module-imports.t violations
Augie Fackler <augie@google.com>
parents:
35709
diff
changeset
|
6 > import sys |
35455 | 7 > path = os.path.join(os.environ['TESTTMP'], 'messages') |
8 > messages = open(path).read().split('--\n') | |
9 > prompt = open(sys.argv[1]).read() | |
10 > sys.stdout.write(''.join('EDITOR: %s' % l for l in prompt.splitlines(True))) | |
11 > sys.stdout.flush() | |
12 > with open(sys.argv[1], 'w') as f: | |
13 > f.write(messages[0]) | |
14 > with open(path, 'w') as f: | |
15 > f.write('--\n'.join(messages[1:])) | |
16 > EOF | |
17 | |
18 $ cat >> $HGRCPATH <<EOF | |
19 > [extensions] | |
20 > drawdag=$TESTDIR/drawdag.py | |
21 > split= | |
22 > [ui] | |
23 > interactive=1 | |
35479
8d05705bde0a
test-split: stabilize for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
35455
diff
changeset
|
24 > color=no |
8d05705bde0a
test-split: stabilize for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
35455
diff
changeset
|
25 > paginate=never |
35455 | 26 > [diff] |
27 > git=1 | |
28 > unified=0 | |
29 > [alias] | |
30 > glog=log -G -T '{rev}:{node|short} {desc} {bookmarks}\n' | |
31 > EOF | |
32 | |
33 #if obsstore-on | |
34 $ cat >> $HGRCPATH <<EOF | |
35 > [experimental] | |
36 > evolution=all | |
37 > EOF | |
38 #endif | |
39 | |
40 $ hg init a | |
41 $ cd a | |
42 | |
43 Nothing to split | |
44 | |
45 $ hg split | |
46 nothing to split | |
47 [1] | |
48 | |
49 $ hg commit -m empty --config ui.allowemptycommit=1 | |
50 $ hg split | |
51 abort: cannot split an empty revision | |
52 [255] | |
53 | |
54 $ rm -rf .hg | |
55 $ hg init | |
56 | |
57 Cannot split working directory | |
58 | |
59 $ hg split -r 'wdir()' | |
60 abort: cannot split working directory | |
61 [255] | |
62 | |
35479
8d05705bde0a
test-split: stabilize for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
35455
diff
changeset
|
63 Generate some content. The sed filter drop CR on Windows, which is dropped in |
8d05705bde0a
test-split: stabilize for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
35455
diff
changeset
|
64 the a > b line. |
35455 | 65 |
35479
8d05705bde0a
test-split: stabilize for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
35455
diff
changeset
|
66 $ $TESTDIR/seq.py 1 5 | sed 's/\r$//' >> a |
35455 | 67 $ hg ci -m a1 -A a -q |
68 $ hg bookmark -i r1 | |
69 $ sed 's/1/11/;s/3/33/;s/5/55/' a > b | |
70 $ mv b a | |
71 $ hg ci -m a2 -q | |
72 $ hg bookmark -i r2 | |
73 | |
74 Cannot split a public changeset | |
75 | |
76 $ hg phase --public -r 'all()' | |
77 $ hg split . | |
78 abort: cannot split public changeset | |
79 (see 'hg help phases' for details) | |
80 [255] | |
81 | |
82 $ hg phase --draft -f -r 'all()' | |
83 | |
84 Cannot split while working directory is dirty | |
85 | |
86 $ touch dirty | |
87 $ hg add dirty | |
88 $ hg split . | |
89 abort: uncommitted changes | |
90 [255] | |
91 $ hg forget dirty | |
92 $ rm dirty | |
93 | |
38412
a0e185f10454
tests: in test-split.t, save a "clean" copy of pre-split repo for later use
Kyle Lippincott <spectral@google.com>
parents:
36645
diff
changeset
|
94 Make a clean directory for future tests to build off of |
35455 | 95 |
38412
a0e185f10454
tests: in test-split.t, save a "clean" copy of pre-split repo for later use
Kyle Lippincott <spectral@google.com>
parents:
36645
diff
changeset
|
96 $ cp -R . ../clean |
a0e185f10454
tests: in test-split.t, save a "clean" copy of pre-split repo for later use
Kyle Lippincott <spectral@google.com>
parents:
36645
diff
changeset
|
97 |
a0e185f10454
tests: in test-split.t, save a "clean" copy of pre-split repo for later use
Kyle Lippincott <spectral@google.com>
parents:
36645
diff
changeset
|
98 Split a head |
35455 | 99 |
100 $ hg bookmark r3 | |
101 | |
102 $ hg split 'all()' | |
103 abort: cannot split multiple revisions | |
104 [255] | |
105 | |
106 $ runsplit() { | |
107 > cat > $TESTTMP/messages <<EOF | |
108 > split 1 | |
109 > -- | |
110 > split 2 | |
111 > -- | |
112 > split 3 | |
113 > EOF | |
114 > cat <<EOF | hg split "$@" | |
115 > y | |
116 > y | |
117 > y | |
118 > y | |
119 > y | |
120 > y | |
121 > EOF | |
122 > } | |
123 | |
124 $ HGEDITOR=false runsplit | |
125 diff --git a/a b/a | |
126 1 hunks, 1 lines changed | |
127 examine changes to 'a'? [Ynesfdaq?] y | |
128 | |
129 @@ -5,1 +5,1 @@ 4 | |
130 -5 | |
131 +55 | |
132 record this change to 'a'? [Ynesfdaq?] y | |
133 | |
134 transaction abort! | |
135 rollback completed | |
136 abort: edit failed: false exited with status 1 | |
137 [255] | |
138 $ hg status | |
139 | |
35479
8d05705bde0a
test-split: stabilize for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
35455
diff
changeset
|
140 $ HGEDITOR="\"$PYTHON\" $TESTTMP/editor.py" |
35455 | 141 $ runsplit |
142 diff --git a/a b/a | |
143 1 hunks, 1 lines changed | |
144 examine changes to 'a'? [Ynesfdaq?] y | |
145 | |
146 @@ -5,1 +5,1 @@ 4 | |
147 -5 | |
148 +55 | |
149 record this change to 'a'? [Ynesfdaq?] y | |
150 | |
151 EDITOR: HG: Splitting 1df0d5c5a3ab. Write commit message for the first split changeset. | |
152 EDITOR: a2 | |
153 EDITOR: | |
154 EDITOR: | |
155 EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed. | |
156 EDITOR: HG: Leave message empty to abort commit. | |
157 EDITOR: HG: -- | |
158 EDITOR: HG: user: test | |
159 EDITOR: HG: branch 'default' | |
160 EDITOR: HG: changed a | |
161 created new head | |
162 diff --git a/a b/a | |
163 1 hunks, 1 lines changed | |
164 examine changes to 'a'? [Ynesfdaq?] y | |
165 | |
166 @@ -3,1 +3,1 @@ 2 | |
167 -3 | |
168 +33 | |
169 record this change to 'a'? [Ynesfdaq?] y | |
170 | |
171 EDITOR: HG: Splitting 1df0d5c5a3ab. So far it has been split into: | |
172 EDITOR: HG: - e704349bd21b: split 1 | |
173 EDITOR: HG: Write commit message for the next split changeset. | |
174 EDITOR: a2 | |
175 EDITOR: | |
176 EDITOR: | |
177 EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed. | |
178 EDITOR: HG: Leave message empty to abort commit. | |
179 EDITOR: HG: -- | |
180 EDITOR: HG: user: test | |
181 EDITOR: HG: branch 'default' | |
182 EDITOR: HG: changed a | |
183 diff --git a/a b/a | |
184 1 hunks, 1 lines changed | |
185 examine changes to 'a'? [Ynesfdaq?] y | |
186 | |
187 @@ -1,1 +1,1 @@ | |
188 -1 | |
189 +11 | |
190 record this change to 'a'? [Ynesfdaq?] y | |
191 | |
192 EDITOR: HG: Splitting 1df0d5c5a3ab. So far it has been split into: | |
193 EDITOR: HG: - e704349bd21b: split 1 | |
194 EDITOR: HG: - a09ad58faae3: split 2 | |
195 EDITOR: HG: Write commit message for the next split changeset. | |
196 EDITOR: a2 | |
197 EDITOR: | |
198 EDITOR: | |
199 EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed. | |
200 EDITOR: HG: Leave message empty to abort commit. | |
201 EDITOR: HG: -- | |
202 EDITOR: HG: user: test | |
203 EDITOR: HG: branch 'default' | |
204 EDITOR: HG: changed a | |
35479
8d05705bde0a
test-split: stabilize for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
35455
diff
changeset
|
205 saved backup bundle to $TESTTMP/a/.hg/strip-backup/1df0d5c5a3ab-8341b760-split.hg (obsstore-off !) |
35455 | 206 |
207 #if obsstore-off | |
208 $ hg bookmark | |
209 r1 0:a61bcde8c529 | |
210 r2 3:00eebaf8d2e2 | |
211 * r3 3:00eebaf8d2e2 | |
212 $ hg glog -p | |
213 @ 3:00eebaf8d2e2 split 3 r2 r3 | |
214 | diff --git a/a b/a | |
215 | --- a/a | |
216 | +++ b/a | |
217 | @@ -1,1 +1,1 @@ | |
218 | -1 | |
219 | +11 | |
220 | | |
221 o 2:a09ad58faae3 split 2 | |
222 | diff --git a/a b/a | |
223 | --- a/a | |
224 | +++ b/a | |
225 | @@ -3,1 +3,1 @@ | |
226 | -3 | |
227 | +33 | |
228 | | |
229 o 1:e704349bd21b split 1 | |
230 | diff --git a/a b/a | |
231 | --- a/a | |
232 | +++ b/a | |
233 | @@ -5,1 +5,1 @@ | |
234 | -5 | |
235 | +55 | |
236 | | |
237 o 0:a61bcde8c529 a1 r1 | |
238 diff --git a/a b/a | |
239 new file mode 100644 | |
240 --- /dev/null | |
241 +++ b/a | |
242 @@ -0,0 +1,5 @@ | |
243 +1 | |
244 +2 | |
245 +3 | |
246 +4 | |
247 +5 | |
248 | |
249 #else | |
250 $ hg bookmark | |
251 r1 0:a61bcde8c529 | |
252 r2 4:00eebaf8d2e2 | |
253 * r3 4:00eebaf8d2e2 | |
254 $ hg glog | |
255 @ 4:00eebaf8d2e2 split 3 r2 r3 | |
256 | | |
257 o 3:a09ad58faae3 split 2 | |
258 | | |
259 o 2:e704349bd21b split 1 | |
260 | | |
261 o 0:a61bcde8c529 a1 r1 | |
262 | |
263 #endif | |
264 | |
265 Split a head while working parent is not that head | |
266 | |
38412
a0e185f10454
tests: in test-split.t, save a "clean" copy of pre-split repo for later use
Kyle Lippincott <spectral@google.com>
parents:
36645
diff
changeset
|
267 $ cp -R $TESTTMP/clean $TESTTMP/b |
35455 | 268 $ cd $TESTTMP/b |
269 | |
270 $ hg up 0 -q | |
271 $ hg bookmark r3 | |
272 | |
273 $ runsplit tip >/dev/null | |
274 | |
275 #if obsstore-off | |
276 $ hg bookmark | |
277 r1 0:a61bcde8c529 | |
278 r2 3:00eebaf8d2e2 | |
279 * r3 0:a61bcde8c529 | |
280 $ hg glog | |
281 o 3:00eebaf8d2e2 split 3 r2 | |
282 | | |
283 o 2:a09ad58faae3 split 2 | |
284 | | |
285 o 1:e704349bd21b split 1 | |
286 | | |
287 @ 0:a61bcde8c529 a1 r1 r3 | |
288 | |
289 #else | |
290 $ hg bookmark | |
291 r1 0:a61bcde8c529 | |
292 r2 4:00eebaf8d2e2 | |
293 * r3 0:a61bcde8c529 | |
294 $ hg glog | |
295 o 4:00eebaf8d2e2 split 3 r2 | |
296 | | |
297 o 3:a09ad58faae3 split 2 | |
298 | | |
299 o 2:e704349bd21b split 1 | |
300 | | |
301 @ 0:a61bcde8c529 a1 r1 r3 | |
302 | |
303 #endif | |
304 | |
305 Split a non-head | |
306 | |
38412
a0e185f10454
tests: in test-split.t, save a "clean" copy of pre-split repo for later use
Kyle Lippincott <spectral@google.com>
parents:
36645
diff
changeset
|
307 $ cp -R $TESTTMP/clean $TESTTMP/c |
35455 | 308 $ cd $TESTTMP/c |
309 $ echo d > d | |
310 $ hg ci -m d1 -A d | |
311 $ hg bookmark -i d1 | |
312 $ echo 2 >> d | |
313 $ hg ci -m d2 | |
314 $ echo 3 >> d | |
315 $ hg ci -m d3 | |
316 $ hg bookmark -i d3 | |
317 $ hg up '.^' -q | |
318 $ hg bookmark d2 | |
319 $ cp -R . ../d | |
320 | |
321 $ runsplit -r 1 | grep rebasing | |
322 rebasing 2:b5c5ea414030 "d1" (d1) | |
323 rebasing 3:f4a0a8d004cc "d2" (d2) | |
324 rebasing 4:777940761eba "d3" (d3) | |
325 #if obsstore-off | |
326 $ hg bookmark | |
327 d1 4:c4b449ef030e | |
328 * d2 5:c9dd00ab36a3 | |
329 d3 6:19f476bc865c | |
330 r1 0:a61bcde8c529 | |
331 r2 3:00eebaf8d2e2 | |
332 $ hg glog -p | |
333 o 6:19f476bc865c d3 d3 | |
334 | diff --git a/d b/d | |
335 | --- a/d | |
336 | +++ b/d | |
337 | @@ -2,0 +3,1 @@ | |
338 | +3 | |
339 | | |
340 @ 5:c9dd00ab36a3 d2 d2 | |
341 | diff --git a/d b/d | |
342 | --- a/d | |
343 | +++ b/d | |
344 | @@ -1,0 +2,1 @@ | |
345 | +2 | |
346 | | |
347 o 4:c4b449ef030e d1 d1 | |
348 | diff --git a/d b/d | |
349 | new file mode 100644 | |
350 | --- /dev/null | |
351 | +++ b/d | |
352 | @@ -0,0 +1,1 @@ | |
353 | +d | |
354 | | |
355 o 3:00eebaf8d2e2 split 3 r2 | |
356 | diff --git a/a b/a | |
357 | --- a/a | |
358 | +++ b/a | |
359 | @@ -1,1 +1,1 @@ | |
360 | -1 | |
361 | +11 | |
362 | | |
363 o 2:a09ad58faae3 split 2 | |
364 | diff --git a/a b/a | |
365 | --- a/a | |
366 | +++ b/a | |
367 | @@ -3,1 +3,1 @@ | |
368 | -3 | |
369 | +33 | |
370 | | |
371 o 1:e704349bd21b split 1 | |
372 | diff --git a/a b/a | |
373 | --- a/a | |
374 | +++ b/a | |
375 | @@ -5,1 +5,1 @@ | |
376 | -5 | |
377 | +55 | |
378 | | |
379 o 0:a61bcde8c529 a1 r1 | |
380 diff --git a/a b/a | |
381 new file mode 100644 | |
382 --- /dev/null | |
383 +++ b/a | |
384 @@ -0,0 +1,5 @@ | |
385 +1 | |
386 +2 | |
387 +3 | |
388 +4 | |
389 +5 | |
390 | |
391 #else | |
392 $ hg bookmark | |
393 d1 8:c4b449ef030e | |
394 * d2 9:c9dd00ab36a3 | |
395 d3 10:19f476bc865c | |
396 r1 0:a61bcde8c529 | |
397 r2 7:00eebaf8d2e2 | |
398 $ hg glog | |
399 o 10:19f476bc865c d3 d3 | |
400 | | |
401 @ 9:c9dd00ab36a3 d2 d2 | |
402 | | |
403 o 8:c4b449ef030e d1 d1 | |
404 | | |
405 o 7:00eebaf8d2e2 split 3 r2 | |
406 | | |
407 o 6:a09ad58faae3 split 2 | |
408 | | |
409 o 5:e704349bd21b split 1 | |
410 | | |
411 o 0:a61bcde8c529 a1 r1 | |
412 | |
413 #endif | |
414 | |
415 Split a non-head without rebase | |
416 | |
417 $ cd $TESTTMP/d | |
418 #if obsstore-off | |
419 $ runsplit -r 1 --no-rebase | |
420 abort: cannot split changeset with children without rebase | |
421 [255] | |
422 #else | |
423 $ runsplit -r 1 --no-rebase >/dev/null | |
35709
1a09dad8b85a
evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
35508
diff
changeset
|
424 3 new orphan changesets |
35455 | 425 $ hg bookmark |
426 d1 2:b5c5ea414030 | |
427 * d2 3:f4a0a8d004cc | |
428 d3 4:777940761eba | |
429 r1 0:a61bcde8c529 | |
430 r2 7:00eebaf8d2e2 | |
431 | |
432 $ hg glog | |
433 o 7:00eebaf8d2e2 split 3 r2 | |
434 | | |
435 o 6:a09ad58faae3 split 2 | |
436 | | |
437 o 5:e704349bd21b split 1 | |
438 | | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35479
diff
changeset
|
439 | * 4:777940761eba d3 d3 |
35455 | 440 | | |
441 | @ 3:f4a0a8d004cc d2 d2 | |
442 | | | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35479
diff
changeset
|
443 | * 2:b5c5ea414030 d1 d1 |
35455 | 444 | | |
445 | x 1:1df0d5c5a3ab a2 | |
446 |/ | |
447 o 0:a61bcde8c529 a1 r1 | |
448 | |
449 #endif | |
450 | |
451 Split a non-head with obsoleted descendants | |
452 | |
453 #if obsstore-on | |
454 $ hg init $TESTTMP/e | |
455 $ cd $TESTTMP/e | |
456 $ hg debugdrawdag <<'EOS' | |
457 > H I J | |
458 > | | | | |
459 > F G1 G2 # amend: G1 -> G2 | |
460 > | | / # prune: F | |
461 > C D E | |
462 > \|/ | |
463 > B | |
464 > | | |
465 > A | |
466 > EOS | |
35709
1a09dad8b85a
evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
35508
diff
changeset
|
467 2 new orphan changesets |
35455 | 468 $ eval `hg tags -T '{tag}={node}\n'` |
469 $ rm .hg/localtags | |
470 $ hg split $B --config experimental.evolution=createmarkers | |
471 abort: split would leave orphaned changesets behind | |
472 [255] | |
473 $ cat > $TESTTMP/messages <<EOF | |
474 > Split B | |
475 > EOF | |
476 $ cat <<EOF | hg split $B | |
477 > y | |
478 > y | |
479 > EOF | |
480 diff --git a/B b/B | |
481 new file mode 100644 | |
482 examine changes to 'B'? [Ynesfdaq?] y | |
483 | |
484 @@ -0,0 +1,1 @@ | |
485 +B | |
486 \ No newline at end of file | |
487 record this change to 'B'? [Ynesfdaq?] y | |
488 | |
489 EDITOR: HG: Splitting 112478962961. Write commit message for the first split changeset. | |
490 EDITOR: B | |
491 EDITOR: | |
492 EDITOR: | |
493 EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed. | |
494 EDITOR: HG: Leave message empty to abort commit. | |
495 EDITOR: HG: -- | |
496 EDITOR: HG: user: test | |
497 EDITOR: HG: branch 'default' | |
498 EDITOR: HG: added B | |
499 created new head | |
500 rebasing 2:26805aba1e60 "C" | |
501 rebasing 3:be0ef73c17ad "D" | |
502 rebasing 4:49cb92066bfd "E" | |
503 rebasing 7:97a6268cc7ef "G2" | |
504 rebasing 10:e2f1e425c0db "J" | |
505 $ hg glog -r 'sort(all(), topo)' | |
506 o 16:556c085f8b52 J | |
507 | | |
508 o 15:8761f6c9123f G2 | |
509 | | |
510 o 14:a7aeffe59b65 E | |
511 | | |
512 | o 13:e1e914ede9ab D | |
513 |/ | |
514 | o 12:01947e9b98aa C | |
515 |/ | |
516 o 11:0947baa74d47 Split B | |
517 | | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35479
diff
changeset
|
518 | * 9:88ede1d5ee13 I |
35455 | 519 | | |
520 | x 6:af8cbf225b7b G1 | |
521 | | | |
522 | x 3:be0ef73c17ad D | |
523 | | | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35479
diff
changeset
|
524 | | * 8:74863e5b5074 H |
35455 | 525 | | | |
526 | | x 5:ee481a2a1e69 F | |
527 | | | | |
528 | | x 2:26805aba1e60 C | |
529 | |/ | |
530 | x 1:112478962961 B | |
531 |/ | |
532 o 0:426bada5c675 A | |
533 | |
534 #endif | |
38424
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
535 |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
536 Preserve secret phase in split |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
537 |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
538 $ cp -R $TESTTMP/clean $TESTTMP/phases1 |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
539 $ cd $TESTTMP/phases1 |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
540 $ hg phase --secret -fr tip |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
541 $ hg log -T '{short(node)} {phase}\n' |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
542 1df0d5c5a3ab secret |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
543 a61bcde8c529 draft |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
544 $ runsplit tip >/dev/null |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
545 $ hg log -T '{short(node)} {phase}\n' |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
546 00eebaf8d2e2 secret |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
547 a09ad58faae3 secret |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
548 e704349bd21b secret |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
549 a61bcde8c529 draft |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
550 |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
551 Do not move things to secret even if phases.new-commit=secret |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
552 |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
553 $ cp -R $TESTTMP/clean $TESTTMP/phases2 |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
554 $ cd $TESTTMP/phases2 |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
555 $ cat >> .hg/hgrc <<EOF |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
556 > [phases] |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
557 > new-commit=secret |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
558 > EOF |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
559 $ hg log -T '{short(node)} {phase}\n' |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
560 1df0d5c5a3ab draft |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
561 a61bcde8c529 draft |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
562 $ runsplit tip >/dev/null |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
563 $ hg log -T '{short(node)} {phase}\n' |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
564 00eebaf8d2e2 draft |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
565 a09ad58faae3 draft |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
566 e704349bd21b draft |
4f885770c4a2
split: preserve phase of commit that is being split
Martin von Zweigbergk <martinvonz@google.com>
parents:
38412
diff
changeset
|
567 a61bcde8c529 draft |