merge wheezy target into master checkout instead of other way around

Signed-off-by: Bill Erickson <berick@esilibrary.com>

diff --git a/installer/wheezy/eg_wheezy_installer.sh b/installer/wheezy/eg_wheezy_installer.sh
index bc29d8b..96e8f95 100755 (executable)
--- a/installer/wheezy/eg_wheezy_installer.sh
+++ b/installer/wheezy/eg_wheezy_installer.sh
@@ -76,20 +76,23 @@ if [ ! "$(grep ^opensrf: /etc/passwd)" ]; then
 export LD_LIBRARY_PATH=/openils/lib:/usr/local/lib:/usr/local/lib/dbd:$LD_LIBRARY_PATH' >> /home/opensrf/.bashrc
 fi;
 
-# XXX for now, fetch the debian-wheezy install target working branches
+# XXX for now, fetch the debian-wheezy install target working branches and merge in master
+# XXX The git-config pieces are only necessary for merging the working branches
 OSRF_COMMAND='
+git config --global user.email "opensrf@example.com"
+git config --global user.name "OpenSRF"
 cd /home/opensrf;
 git clone git://git.evergreen-ils.org/OpenSRF.git;
 cd OpenSRF;
 git remote add working git://git.evergreen-ils.org/working/OpenSRF.git;
 git fetch working
-git checkout -b collab/berick/debian-wheezy-install-target working/collab/berick/debian-wheezy-install-target
+git merge -m "merging wheezy install target" working/collab/berick/debian-wheezy-install-target
 cd /home/opensrf;
 git clone git://git.evergreen-ils.org/Evergreen.git;
 cd Evergreen;
 git remote add working git://git.evergreen-ils.org/working/Evergreen.git;
 git fetch working
-git checkout -b collab/berick/debian-wheezy-install-target working/collab/berick/debian-wheezy-install-target
+git merge -m "merging wheezy install target" working/collab/berick/debian-wheezy-install-target
 '
 su - opensrf sh -c "$OSRF_COMMAND";