equal
deleted
inserted
replaced
337 Resulting changeset should conserve the phase of the original one whatever the |
337 Resulting changeset should conserve the phase of the original one whatever the |
338 phases.new-commit option is. |
338 phases.new-commit option is. |
339 |
339 |
340 New-commit as draft (default) |
340 New-commit as draft (default) |
341 |
341 |
342 $ cp -r base simple-draft |
342 $ cp -R base simple-draft |
343 $ cd simple-draft |
343 $ cd simple-draft |
344 $ hg histedit -r 'b449568bf7fc' --commands - << EOF |
344 $ hg histedit -r 'b449568bf7fc' --commands - << EOF |
345 > edit b449568bf7fc 11 f |
345 > edit b449568bf7fc 11 f |
346 > pick 6b70183d2492 12 g |
346 > pick 6b70183d2492 12 g |
347 > pick 7395e1ff83bd 13 h |
347 > pick 7395e1ff83bd 13 h |
376 $ cd .. |
376 $ cd .. |
377 |
377 |
378 |
378 |
379 New-commit as secret (config) |
379 New-commit as secret (config) |
380 |
380 |
381 $ cp -r base simple-secret |
381 $ cp -R base simple-secret |
382 $ cd simple-secret |
382 $ cd simple-secret |
383 $ cat >> .hg/hgrc << EOF |
383 $ cat >> .hg/hgrc << EOF |
384 > [phases] |
384 > [phases] |
385 > new-commit=secret |
385 > new-commit=secret |
386 > EOF |
386 > EOF |
423 ------------------------------------------- |
423 ------------------------------------------- |
424 |
424 |
425 If a secret changeset is put before a draft one, all descendant should be secret. |
425 If a secret changeset is put before a draft one, all descendant should be secret. |
426 It seems more important to present the secret phase. |
426 It seems more important to present the secret phase. |
427 |
427 |
428 $ cp -r base reorder |
428 $ cp -R base reorder |
429 $ cd reorder |
429 $ cd reorder |
430 $ hg histedit -r 'b449568bf7fc' --commands - << EOF |
430 $ hg histedit -r 'b449568bf7fc' --commands - << EOF |
431 > pick b449568bf7fc 11 f |
431 > pick b449568bf7fc 11 f |
432 > pick 3a6c53ee7f3d 15 j |
432 > pick 3a6c53ee7f3d 15 j |
433 > pick 6b70183d2492 12 g |
433 > pick 6b70183d2492 12 g |
460 Folding a secret changeset with a draft one turn the result secret (again, |
460 Folding a secret changeset with a draft one turn the result secret (again, |
461 better safe than sorry). Folding between same phase changeset still works |
461 better safe than sorry). Folding between same phase changeset still works |
462 |
462 |
463 Note that there is a few reordering in this series for more extensive test |
463 Note that there is a few reordering in this series for more extensive test |
464 |
464 |
465 $ cp -r base folding |
465 $ cp -R base folding |
466 $ cd folding |
466 $ cd folding |
467 $ cat >> .hg/hgrc << EOF |
467 $ cat >> .hg/hgrc << EOF |
468 > [phases] |
468 > [phases] |
469 > new-commit=secret |
469 > new-commit=secret |
470 > EOF |
470 > EOF |