[SCM] Vim packaging branch, debian, updated. upstream/7.2.010-261-g20d1b8b

[James Vega]

The following commit has been merged in the debian branch:
commit 20d1b8bba05d823d825ed2a1201c6e3d2835eb59
Author: James Vega <jamessan at debian.org>
Date:   Sun Oct 12 03:13:15 2008 -0400

    Remove update-patches' revert in onlyupstream mode
    
    Signed-off-by: James Vega <jamessan at debian.org>

diff --git a/debian/update-patches b/debian/update-patches
index 2ae6dca..02e7ac8 100755
--- a/debian/update-patches
+++ b/debian/update-patches
@@ -98,10 +98,10 @@ if [ $onlyupstream -eq 0 ]; then
         checkout_and_merge $b upstream-runtime
     done
 else
-    # Revert the debian/README commit which was solely used to generate proper
-    # commit messages in the upstream branch
+    # Switch back to the debian branch and leave the updated README in place.
+    # It's useful as a place-holder and to help document no new patches have
+    # been added.
     git checkout debian
-    git reset --hard HEAD^
 fi
 
 echo "Patches $curpatch - $newpatch comitted and merged."

-- 
Vim packaging