The following commit has been merged in the master branch:
commit 269d1f8eb797152458ffc96d6c48aa413a706d92
Author: Michael Hall <[email protected]>
Date: Mon Mar 5 14:15:21 2012 -0500
edit-patch: fix quilt patching
diff --git a/scripts/edit-patch.sh b/scripts/edit-patch.sh
index 671c7ba..2843775 100755
--- a/scripts/edit-patch.sh
+++ b/scripts/edit-patch.sh
@@ -121,6 +121,8 @@ edit_patch_dpatch() {
edit_patch_quilt() {
export QUILT_PATCHES=debian/patches
+ top_patch=$(quilt top)
+ echo "Top patch: $top_patch"
if [ -e $PREFIX/$1 ]; then
# if its a existing patch and we are at the end of the stack,
# go back at the beginning
@@ -138,7 +140,8 @@ edit_patch_quilt() {
# use a sub-shell
quilt shell
quilt refresh
- quilt pop -a
+ echo "Reverting quilt back to $top_patch"
+ quilt pop $top_patch
vcs_add $PREFIX/$1 $PREFIX/series
}
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
