From: Ivan Kohler Date: Fri, 4 Mar 2016 02:06:11 +0000 (-0800) Subject: fix release script X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=0769dd2b2f407d4b4b7f2864eb8690cd631c345b fix release script --- diff --git a/bin/freeside-debian-releases.sh b/bin/freeside-debian-releases.sh index e832d9176..03a163a79 100755 --- a/bin/freeside-debian-releases.sh +++ b/bin/freeside-debian-releases.sh @@ -27,7 +27,9 @@ rm -fr $DIR/freeside/debian/freeside-ng-selfservice.conffiles # Pull any changes cd $DIR/freeside -STATUS=`git pull` +git checkout -- debian/changelog +git pull +#STATUS=`git pull` #Assign the proper config files for freeside-ng-selfservice if [ $DISTRO = "wheezy" ]; then