Show More
@@ -170,7 +170,7 b' def dosplit(ui, repo, tr, ctx, opts):' | |||||
170 | raise error.Abort(_('cannot split an empty revision')) |
|
170 | raise error.Abort(_('cannot split an empty revision')) | |
171 |
|
171 | |||
172 | scmutil.cleanupnodes(repo, {ctx.node(): [c.node() for c in committed]}, |
|
172 | scmutil.cleanupnodes(repo, {ctx.node(): [c.node() for c in committed]}, | |
173 | operation='split') |
|
173 | operation='split', fixphase=True) | |
174 |
|
174 | |||
175 | return committed[-1] |
|
175 | return committed[-1] | |
176 |
|
176 |
@@ -532,3 +532,36 b' Split a non-head with obsoleted descenda' | |||||
532 | o 0:426bada5c675 A |
|
532 | o 0:426bada5c675 A | |
533 |
|
533 | |||
534 | #endif |
|
534 | #endif | |
|
535 | ||||
|
536 | Preserve secret phase in split | |||
|
537 | ||||
|
538 | $ cp -R $TESTTMP/clean $TESTTMP/phases1 | |||
|
539 | $ cd $TESTTMP/phases1 | |||
|
540 | $ hg phase --secret -fr tip | |||
|
541 | $ hg log -T '{short(node)} {phase}\n' | |||
|
542 | 1df0d5c5a3ab secret | |||
|
543 | a61bcde8c529 draft | |||
|
544 | $ runsplit tip >/dev/null | |||
|
545 | $ hg log -T '{short(node)} {phase}\n' | |||
|
546 | 00eebaf8d2e2 secret | |||
|
547 | a09ad58faae3 secret | |||
|
548 | e704349bd21b secret | |||
|
549 | a61bcde8c529 draft | |||
|
550 | ||||
|
551 | Do not move things to secret even if phases.new-commit=secret | |||
|
552 | ||||
|
553 | $ cp -R $TESTTMP/clean $TESTTMP/phases2 | |||
|
554 | $ cd $TESTTMP/phases2 | |||
|
555 | $ cat >> .hg/hgrc <<EOF | |||
|
556 | > [phases] | |||
|
557 | > new-commit=secret | |||
|
558 | > EOF | |||
|
559 | $ hg log -T '{short(node)} {phase}\n' | |||
|
560 | 1df0d5c5a3ab draft | |||
|
561 | a61bcde8c529 draft | |||
|
562 | $ runsplit tip >/dev/null | |||
|
563 | $ hg log -T '{short(node)} {phase}\n' | |||
|
564 | 00eebaf8d2e2 draft | |||
|
565 | a09ad58faae3 draft | |||
|
566 | e704349bd21b draft | |||
|
567 | a61bcde8c529 draft |
General Comments 0
You need to be logged in to leave comments.
Login now