Ticket #181: hg-buildbot-merge.diff

hgbuildbot.py

@@ -84 +84 @@
             # send changeset
             n = repo.changelog.node(rev)
             changeset=repo.changelog.extract(repo.changelog.revision(n))
+            files =changeset[3]
+            if not files:
+                files = ['merge']
             change = {
                 'master': master,
                 # note: this is more likely to be a full email address, which
@@ -93 +96 @@
                 'username': changeset[1],
                 'revision': hex(n),
                 'comments': changeset[4],
-                'files': changeset[3],
+                'files': files,
                 'branch': branch
             }
             d.addCallback(_send, change)