X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=dcp-init;h=262a2bbd86349c4f6e5f6e801951930cc0660187;hb=37df16fdb343d13e5920802850b942c80ed6d081;hp=3730fb62853849f4fa6aedd37c9832a85666461d;hpb=10557581a6d203fc90819f3db1504c65fd4770fd;p=dcp.git

diff --git a/dcp-init b/dcp-init
index 3730fb6..262a2bb 100755
--- a/dcp-init
+++ b/dcp-init
@@ -3,10 +3,11 @@
 set -e
 
 usage() {
-    echo "usage: dcp-init [-sh] [-C key=val] [-d REPODIR] PACKAGE [PATCH...]"
+    echo "usage: dcp-init [-sh] [-C key=val] [-d REPODIR] PACKAGE [(PATCH|-m)...]"
     echo "       PATCH ::= [-p LEVEL] [-bB BRANCH] FILE"
     echo "       -b creates a new branch at the current patch"
     echo "       -B creates a new branch at the upstream sources"
+    echo "       -m merges the current branch into the master branch"
 }
 
 rungit() {
@@ -55,10 +56,10 @@ initbase() {
     mkdir "$td/control/update.d"
     cat >"$td/control/functions" <<EOF
 readconf() {
-    if [ -r "$HOME/.dcp-build-conf" ]; then
+    if [ -r "\$HOME/.dcp-build-conf" ]; then
         while read key val; do
             export "CONF_\$key"="\$val"
-        done <"$HOME/.dcp-build-conf"
+        done <"\$HOME/.dcp-build-conf"
     fi
     while read key val; do
         export "CONF_\$key"="\$val"
@@ -206,6 +207,7 @@ initvals() {
     level=0
 }
 initvals
+curbranch=master
 while [ $# -gt 0 ]; do
     arg="$1"
     shift
@@ -214,10 +216,16 @@ while [ $# -gt 0 ]; do
 	    level="$1"
 	    shift
 	elif [ "$arg" = -b ]; then
-	    rungit checkout -q -b "$1"
+	    curbranch="$1"
 	    shift
+	    rungit checkout -q -b "$curbranch"
 	elif [ "$arg" = -B ]; then
-	    rungit checkout -q -b "$1" upstream
+	    curbranch="$1"
+	    shift
+	    rungit checkout -q -b "$curbranch" upstream
+	elif [ "$arg" = -m ]; then
+	    rungit checkout -q master
+	    rungit merge -n "$curbranch"
 	else
 	    echo "dcp-init: unknown patch option '$arg'" >&2
 	    exit 1