Show More
@@ -901,8 +901,8 b' class queue:' | |||||
901 | except: pass |
|
901 | except: pass | |
902 | repo.dirstate.forget(f) |
|
902 | repo.dirstate.forget(f) | |
903 | repo.dirstate.setparents(qp, revlog.nullid) |
|
903 | repo.dirstate.setparents(qp, revlog.nullid) | |
|
904 | del self.applied[start:end] | |||
904 | self.strip(repo, rev, update=False, backup='strip') |
|
905 | self.strip(repo, rev, update=False, backup='strip') | |
905 | del self.applied[start:end] |
|
|||
906 | if len(self.applied): |
|
906 | if len(self.applied): | |
907 | self.ui.write("Now at: %s\n" % self.applied[-1].name) |
|
907 | self.ui.write("Now at: %s\n" % self.applied[-1].name) | |
908 | else: |
|
908 | else: | |
@@ -1086,12 +1086,13 b' class queue:' | |||||
1086 | else: |
|
1086 | else: | |
1087 | message = msg |
|
1087 | message = msg | |
1088 |
|
1088 | |||
|
1089 | self.applied.pop() | |||
|
1090 | self.applied_dirty = 1 | |||
1089 | self.strip(repo, top, update=False, |
|
1091 | self.strip(repo, top, update=False, | |
1090 | backup='strip') |
|
1092 | backup='strip') | |
1091 | n = repo.commit(filelist, message, changes[1], match=matchfn, |
|
1093 | n = repo.commit(filelist, message, changes[1], match=matchfn, | |
1092 | force=1) |
|
1094 | force=1) | |
1093 |
self.applied |
|
1095 | self.applied.append(statusentry(revlog.hex(n), patchfn)) | |
1094 | self.applied_dirty = 1 |
|
|||
1095 | self.removeundo(repo) |
|
1096 | self.removeundo(repo) | |
1096 | else: |
|
1097 | else: | |
1097 | self.printdiff(repo, patchparent, fp=patchf) |
|
1098 | self.printdiff(repo, patchparent, fp=patchf) |
General Comments 0
You need to be logged in to leave comments.
Login now