From: Jim Procter <jprocter@issues.jalview.org>
Date: Sun, 8 Jul 2018 11:55:07 +0000 (+0100)
Subject: JAL-3033 hard reset to clean eclipse workspace before checking out
X-Git-Tag: Release_2_11_4_0~45^2~18^2~564
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=20110ea142e56b44a9b42529fd38154c8ae21562;p=jalview.git

JAL-3033 hard reset to clean eclipse workspace before checking out
---

diff --git a/build.xml b/build.xml
index 4ff78e0..b7f1af3 100755
--- a/build.xml
+++ b/build.xml
@@ -1028,7 +1028,11 @@
   </exec>
   <!-- update and checkout the same commit in the workspace project -->
   <exec executable="/usr/bin/git" failifexecutionfails="true" dir="${eclipse-workrepo}">
-    <arg value="pull" />
+    <arg value="reset" />
+    <arg value="--hard" />
+  </exec>
+  <exec executable="/usr/bin/git" failifexecutionfails="true" dir="${eclipse-workrepo}">
+      <arg value="pull" />
   </exec>
   <exec executable="/usr/bin/git" failifexecutionfails="true" dir="${eclipse-workrepo}">
     <arg value="checkout" />