Show More
@@ -555,7 +555,7 b' class queue(object):' | |||||
555 | if not pushable: |
|
555 | if not pushable: | |
556 | self.explain_pushable(patchname, all_patches=True) |
|
556 | self.explain_pushable(patchname, all_patches=True) | |
557 | continue |
|
557 | continue | |
558 |
self.ui. |
|
558 | self.ui.status(_("applying %s\n") % patchname) | |
559 | pf = os.path.join(patchdir, patchname) |
|
559 | pf = os.path.join(patchdir, patchname) | |
560 |
|
560 | |||
561 | try: |
|
561 | try: | |
@@ -1081,7 +1081,7 b' class queue(object):' | |||||
1081 | repo.dirstate.forget(f) |
|
1081 | repo.dirstate.forget(f) | |
1082 | repo.dirstate.setparents(qp, nullid) |
|
1082 | repo.dirstate.setparents(qp, nullid) | |
1083 | for patch in reversed(self.applied[start:end]): |
|
1083 | for patch in reversed(self.applied[start:end]): | |
1084 |
self.ui. |
|
1084 | self.ui.status(_("popping %s\n") % patch.name) | |
1085 | del self.applied[start:end] |
|
1085 | del self.applied[start:end] | |
1086 | self.strip(repo, rev, update=False, backup='strip') |
|
1086 | self.strip(repo, rev, update=False, backup='strip') | |
1087 | if len(self.applied): |
|
1087 | if len(self.applied): |
General Comments 0
You need to be logged in to leave comments.
Login now