fixed #1262. If the configuration is changed, polling should take a n…

…ote of that. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@7004 71c3de6d-444a-0410-be80-ed276b4c234a
jenkinsci · Feb 7, 2008 · a43c011 · a43c011
1 parent 6b0a11a
commit a43c011
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/core/src/main/java/hudson/scm/CVSSCM.java b/core/src/main/java/hudson/scm/CVSSCM.java
@@ -222,6 +222,11 @@ public boolean isFlatten() {
     }
 
     public boolean pollChanges(AbstractProject project, Launcher launcher, FilePath dir, TaskListener listener) throws IOException, InterruptedException {
+        if(!isUpdatable(dir)) {
+            listener.getLogger().println("Workspace is inconsistent with configuration. Scheduling a new build");
+            return true;
+        }
+
         List<String> changedFiles = update(true, launcher, dir, listener, new Date());
 
         return changedFiles!=null && !changedFiles.isEmpty();