##// END OF EJS Templates
mq: pop correct patches when changing pushable-ness of already applied ones...
FUJIWARA Katsunori -
r22455:c89379d4 stable
parent child Browse files
Show More
@@ -3026,7 +3026,7 b' def select(ui, repo, *args, **opts):'
3026 if i == 0:
3026 if i == 0:
3027 q.pop(repo, all=True)
3027 q.pop(repo, all=True)
3028 else:
3028 else:
3029 q.pop(repo, str(i - 1))
3029 q.pop(repo, q.applied[i - 1].name)
3030 break
3030 break
3031 if popped:
3031 if popped:
3032 try:
3032 try:
@@ -541,3 +541,28 b' test that qselect shows "number of guard'
541 guards deactivated
541 guards deactivated
542 $ hg qselect not-new not-c not-d
542 $ hg qselect not-new not-c not-d
543 number of guarded, applied patches has changed from 0 to 1
543 number of guarded, applied patches has changed from 0 to 1
544
545 test that "qselect --reapply" reapplies patches successfully when the
546 already applied patch becomes unguarded and it follows the already
547 guarded (= not yet applied) one.
548
549 $ hg qpop -q -a
550 patch queue now empty
551 $ hg qselect not-new not-c
552 number of unguarded, unapplied patches has changed from 1 to 2
553 $ hg qpush -q -a
554 patch d.patch is empty
555 now at: b.patch
556 $ hg qapplied -v
557 0 G new.patch
558 1 G c.patch
559 2 A d.patch
560 3 A b.patch
561 $ hg qselect -q --reapply not-c not-b
562 now at: d.patch
563 cannot push 'b.patch' - guarded by '-not-b'
564 $ hg qseries -v
565 0 U new.patch
566 1 G c.patch
567 2 A d.patch
568 3 G b.patch
General Comments 0
You need to be logged in to leave comments. Login now