Merge pull request #273 from maruel/bb_sourcestamp2

Change SourceStamp.canBeMergedWith to behave like described in the doc.
buildbot · Oct 25, 2011 · 518fdac · 518fdac
2 parents b46cb09 + 925b8b1
commit 518fdac
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/master/buildbot/sourcestamp.py b/master/buildbot/sourcestamp.py
@@ -169,6 +169,8 @@ def canBeMergedWith(self, other):
             return False # the builds are completely unrelated
         if other.project != self.project:
             return False
+        if self.patch or other.patch:
+            return False # you can't merge patched builds with anything
 
         if self.changes and other.changes:
             return True
@@ -177,8 +179,6 @@ def canBeMergedWith(self, other):
         elif not self.changes and other.changes:
             return False # they're using changes, we aren't
 
-        if self.patch or other.patch:
-            return False # you can't merge patched builds with anything
         if self.revision == other.revision:
             # both builds are using the same specific revision, so they can
             # be merged. It might be the case that revision==None, so they're