fix: attr. repository, not revision (dup); copy project/repository on…

… merge Signed-off-by: Dustin J. Mitchell <dustin@zmanda.com>
djmitche · Apr 9, 2010 · ab80d81 · ab80d81
1 parent c249a12
commit ab80d81
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/buildbot/sourcestamp.py b/buildbot/sourcestamp.py
@@ -32,7 +32,7 @@ class SourceStamp(util.ComparableMixin, styles.Versioned):
     patch = None
     changes = ()
     project = ''
-    revision = ''
+    repository = ''
     ssid = None # filled in by db.get_sourcestampid()
 
     compare_attrs = ('branch', 'revision', 'patch', 'changes', 'project', 'repository')
@@ -117,6 +117,8 @@ def mergeWith(self, others):
         newsource = SourceStamp(branch=self.branch,
                                 revision=self.revision,
                                 patch=self.patch,
+                                project=self.project,
+                                repository=self.repository,
                                 changes=changes)
         return newsource