##// END OF EJS Templates
mq: fix traceback for qpush inexistant-patch with no patch applied
Benoit Allard -
r9590:07a62819 default
parent child Browse files
Show More
@@ -977,6 +977,8 b' class queue(object):'
977 self.ui.warn(_('done\n'))
977 self.ui.warn(_('done\n'))
978 raise
978 raise
979
979
980 if not self.applied:
981 return ret[0]
980 top = self.applied[-1].name
982 top = self.applied[-1].name
981 if ret[0] and ret[0] > 1:
983 if ret[0] and ret[0] > 1:
982 msg = _("errors during apply, please fix and refresh %s\n")
984 msg = _("errors during apply, please fix and refresh %s\n")
@@ -53,4 +53,10 b' rm .hg/patches/patch2'
53 echo '% now we expect the push to fail, but it should NOT complain about patch1'
53 echo '% now we expect the push to fail, but it should NOT complain about patch1'
54 hg qpush
54 hg qpush
55
55
56 echo '% preparing qpush of missing patch with no patch applied'
57 hg qpop -a
58 rm .hg/patches/patch1
59 echo '% qpush should fail the same way as below'
60 hg qpush
61
56 true # happy ending
62 true # happy ending
@@ -27,3 +27,8 b' now at: patch1'
27 applying patch2
27 applying patch2
28 unable to read patch2
28 unable to read patch2
29 now at: patch1
29 now at: patch1
30 % preparing qpush of missing patch with no patch applied
31 patch queue now empty
32 % qpush should fail the same way as below
33 applying patch1
34 unable to read patch1
General Comments 0
You need to be logged in to leave comments. Login now