changeset 608:1650e9a237b9

Merge branch Gaya-8.0.x
author Dmitry Neverov <dmitry.neverov@gmail.com>
date Fri, 28 Jun 2013 00:15:12 +0400
parents 0e21f908b10d (current diff) 4214e5e65262 (diff)
children 37657248ac78
files
diffstat 2 files changed, 3 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/.idea/ant.xml	Fri Jun 07 19:05:23 2013 +0400
+++ b/.idea/ant.xml	Fri Jun 28 00:15:12 2013 +0400
@@ -1,23 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="AntConfiguration">
-    <defaultAnt bundledAnt="true" />
     <buildFile url="file://$PROJECT_DIR$/build.xml">
-      <additionalClassPath />
-      <antReference projectDefault="true" />
-      <customJdkName value="" />
-      <maximumHeapSize value="128" />
       <maximumStackSize value="32" />
-      <properties />
     </buildFile>
-    <buildFile url="file://$PROJECT_DIR$/build/ant.build.xml">
-      <additionalClassPath />
-      <antReference projectDefault="true" />
-      <customJdkName value="" />
-      <maximumHeapSize value="128" />
-      <maximumStackSize value="2" />
-      <properties />
-    </buildFile>
+    <buildFile url="file://$PROJECT_DIR$/build/ant.build.xml" />
   </component>
 </project>
 
--- a/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/OperationContext.java	Fri Jun 07 19:05:23 2013 +0400
+++ b/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/OperationContext.java	Fri Jun 28 00:15:12 2013 +0400
@@ -257,7 +257,8 @@
       if (!myVisitedUninterestingRevisions.isEmpty())
         return;
       for (String rev : myUninterestingRevisions) {
-        myDag.breadthFirstSearch(rev, new MarkUninterestingRevisions());
+        if (myDag.containsNode(rev))
+          myDag.breadthFirstSearch(rev, new MarkUninterestingRevisions());
       }
     }