Show More
@@ -902,14 +902,14 b' class queue(object):' | |||
|
902 | 902 | def push(self, repo, patch=None, force=False, list=False, |
|
903 | 903 | mergeq=None, all=False): |
|
904 | 904 | wlock = repo.wlock() |
|
905 | if repo.dirstate.parents()[0] not in repo.heads(): | |
|
906 | self.ui.status(_("(working directory not at a head)\n")) | |
|
905 | try: | |
|
906 | if repo.dirstate.parents()[0] not in repo.heads(): | |
|
907 | self.ui.status(_("(working directory not at a head)\n")) | |
|
907 | 908 | |
|
908 | if not self.series: | |
|
909 | self.ui.warn(_('no patches in series\n')) | |
|
910 | return 0 | |
|
909 | if not self.series: | |
|
910 | self.ui.warn(_('no patches in series\n')) | |
|
911 | return 0 | |
|
911 | 912 | |
|
912 | try: | |
|
913 | 913 | patch = self.lookup(patch) |
|
914 | 914 | # Suppose our series file is: A B C and the current 'top' |
|
915 | 915 | # patch is B. qpush C should be performed (moving forward) |
General Comments 0
You need to be logged in to leave comments.
Login now