equal
deleted
inserted
replaced
764 raise util.Abort(_("patch %s not in series") % patch) |
764 raise util.Abort(_("patch %s not in series") % patch) |
765 |
765 |
766 def push(self, repo, patch=None, force=False, list=False, |
766 def push(self, repo, patch=None, force=False, list=False, |
767 mergeq=None): |
767 mergeq=None): |
768 wlock = repo.wlock() |
768 wlock = repo.wlock() |
|
769 if repo.dirstate.parents()[0] != repo.lookup("tip"): |
|
770 self.ui.status(_("(working directory not at tip)\n")) |
|
771 |
769 try: |
772 try: |
770 patch = self.lookup(patch) |
773 patch = self.lookup(patch) |
771 # Suppose our series file is: A B C and the current 'top' |
774 # Suppose our series file is: A B C and the current 'top' |
772 # patch is B. qpush C should be performed (moving forward) |
775 # patch is B. qpush C should be performed (moving forward) |
773 # qpush B is a NOP (no change) qpush A is an error (can't |
776 # qpush B is a NOP (no change) qpush A is an error (can't |