~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add --keep option to pop
[stgit]
/
stgit
/
stack.py
diff --git
a/stgit/stack.py
b/stgit/stack.py
index
618182c
..
c1071b5
100644
(file)
--- a/
stgit/stack.py
+++ b/
stgit/stack.py
@@
-925,7
+925,7
@@
class Series:
self.pop_patch(name)
return patch.restore_old_boundaries()
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()
"""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)
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
# save the new applied list
idx = applied.index(name) + 1