Show More
@@ -519,7 +519,10 b' cleaning up' | |||||
519 | $ hg qpush --move test.patch # already applied |
|
519 | $ hg qpush --move test.patch # already applied | |
520 | abort: cannot push to a previous patch: test.patch |
|
520 | abort: cannot push to a previous patch: test.patch | |
521 | [255] |
|
521 | [255] | |
522 | $ sed -i.bak '2i\# make qtip index different in series and fullseries' `hg root`/.hg/patches/series |
|
522 | $ sed '2i\ | |
|
523 | > # make qtip index different in series and fullseries | |||
|
524 | > ' `hg root`/.hg/patches/series > $TESTTMP/sedtmp | |||
|
525 | $ cp $TESTTMP/sedtmp `hg root`/.hg/patches/series | |||
523 | $ cat `hg root`/.hg/patches/series |
|
526 | $ cat `hg root`/.hg/patches/series | |
524 | # comment |
|
527 | # comment | |
525 | # make qtip index different in series and fullseries |
|
528 | # make qtip index different in series and fullseries | |
@@ -1496,12 +1499,14 b' Test that qfinish respect phases.new-com' | |||||
1496 |
|
1499 | |||
1497 | (restore env for next test) |
|
1500 | (restore env for next test) | |
1498 |
|
1501 | |||
1499 |
$ sed |
|
1502 | $ sed -e 's/new-commit=secret//' $HGRCPATH > $TESTTMP/sedtmp | |
|
1503 | $ cp $TESTTMP/sedtmp $HGRCPATH | |||
1500 | $ hg qimport -r 1 --name add-file2 |
|
1504 | $ hg qimport -r 1 --name add-file2 | |
1501 |
|
1505 | |||
1502 | Test that qfinish preserve phase when mq.secret=false |
|
1506 | Test that qfinish preserve phase when mq.secret=false | |
1503 |
|
1507 | |||
1504 |
$ sed |
|
1508 | $ sed -e 's/secret=true/secret=false/' $HGRCPATH > $TESTTMP/sedtmp | |
|
1509 | $ cp $TESTTMP/sedtmp $HGRCPATH | |||
1505 | $ hg qfinish qbase |
|
1510 | $ hg qfinish qbase | |
1506 | patch add-file2 finalized without changeset message |
|
1511 | patch add-file2 finalized without changeset message | |
1507 | $ hg phase 'all()' |
|
1512 | $ hg phase 'all()' |
General Comments 0
You need to be logged in to leave comments.
Login now