X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/2406f7d16cad24d396b3e8ea5605813f4011b5a6..f46f4413587c2941a555aa6014c3e306bbd67fd6:/stgit/stack.py diff --git a/stgit/stack.py b/stgit/stack.py index 618182c..c1071b5 100644 --- a/stgit/stack.py +++ b/stgit/stack.py @@ -925,7 +925,7 @@ class Series: self.pop_patch(name) return patch.restore_old_boundaries() - def pop_patch(self, name): + def pop_patch(self, name, keep = False): """Pops the top patch from the stack """ applied = self.get_applied() @@ -934,7 +934,7 @@ class Series: patch = Patch(name, self.__patch_dir, self.__refs_dir) - git.switch(patch.get_bottom()) + git.switch(patch.get_bottom(), keep) # save the new applied list idx = applied.index(name) + 1