From caca6114e37f51cf585a3664b9aa99b856ebf9f8 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Thu, 21 Jun 2012 11:42:24 -0400 Subject: [PATCH] merge wheezy target into master checkout instead of other way around Signed-off-by: Bill Erickson --- installer/wheezy/eg_wheezy_installer.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/installer/wheezy/eg_wheezy_installer.sh b/installer/wheezy/eg_wheezy_installer.sh index bc29d8bbb..96e8f95d1 100755 --- 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"; -- 2.11.0