[Pkg-mono-svn-commits] [SCM] mono branch, master-experimental, updated. debian/2.6.3-4-34-gd1bf954

Mirco Bauer meebey at meebey.net
Thu Aug 12 01:19:23 UTC 2010


The following commit has been merged in the master-experimental branch:
commit a7dc3450831f6c1b08e86f3ce8407ff744556705
Author: Mirco Bauer <meebey at meebey.net>
Date:   Sat Aug 7 01:16:07 2010 +0200

    Helper script for pulling patch branches

diff --git a/debian/git-merge-debian-patches b/debian/git-pull-debian-patches
similarity index 67%
copy from debian/git-merge-debian-patches
copy to debian/git-pull-debian-patches
index f8d17f6..5868fc3 100755
--- a/debian/git-merge-debian-patches
+++ b/debian/git-pull-debian-patches
@@ -1,6 +1,7 @@
-#!/bin/sh
+#!/bin/sh -e
 
 DEBIAN_PATCHES=$(git branch -l | egrep '\s+debian/patches/')
 for DEBIAN_PATCH in $DEBIAN_PATCHES; do
-	git merge --no-ff $DEBIAN_PATCH
+	git checkout $DEBIAN_PATCH
+	git pull
 done 

-- 
mono



More information about the Pkg-mono-svn-commits mailing list