JAL-3033 hard reset to clean eclipse workspace before checking out
authorJim Procter <jprocter@issues.jalview.org>
Sun, 8 Jul 2018 11:55:07 +0000 (12:55 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Sun, 8 Jul 2018 11:55:07 +0000 (12:55 +0100)
build.xml

index 4ff78e0..b7f1af3 100755 (executable)
--- a/build.xml
+++ b/build.xml
   </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" />