Author: aduprat
Date: Tue Nov 10 14:51:04 2015
New Revision: 1713659
URL: http://svn.apache.org/viewvc?rev=1713659&view=rev
Log:
Merge branch on apache/trunk instead of origin/trunk. Contributed by Duprat
<[email protected]>
Modified:
james/project/trunk/dockerfiles/merge/merge.sh
Modified: james/project/trunk/dockerfiles/merge/merge.sh
URL:
http://svn.apache.org/viewvc/james/project/trunk/dockerfiles/merge/merge.sh?rev=1713659&r1=1713658&r2=1713659&view=diff
==============================================================================
--- james/project/trunk/dockerfiles/merge/merge.sh (original)
+++ james/project/trunk/dockerfiles/merge/merge.sh Tue Nov 10 14:51:04 2015
@@ -15,9 +15,16 @@ fi
SHA1=$1
RESULTING_BRANCH=$2
+APACHE_REPO=`git remote show | grep apache || true`
+if [ -z "$APACHE_REPO" ]; then
+ git remote add apache https://github.com/apache/james-project.git
+fi
+git fetch apache
+git checkout apache/trunk -b trunk
+
git fetch origin
-git checkout trunk
git checkout $SHA1 -b SHA1_BRANCH
+
git checkout trunk
git checkout -b $RESULTING_BRANCH
git merge --no-edit SHA1_BRANCH
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
