Bug 1356225 - Use merge for upstreaming wpt commits, a=testonly
authorJames Graham <james@hoppipolla.co.uk>
Tue, 04 Apr 2017 17:04:36 +0100
changeset 354020 e3e321ce75dfa7d31a154cbdfca9641d1a4a839b
parent 354019 ab00229faf2cde3509730ce14f5aed8cf49ed6dd
child 354021 16435cb6efc075aa4aee2d315074acdfab7783b2
push id89391
push userjames@hoppipolla.co.uk
push dateThu, 20 Apr 2017 10:00:08 +0000
treeherdermozilla-inbound@1902130057ea [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestonly
bugs1356225
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1356225 - Use merge for upstreaming wpt commits, a=testonly MozReview-Commit-ID: 9NMEKlyrUrE
testing/web-platform/update/github.py
--- a/testing/web-platform/update/github.py
+++ b/testing/web-platform/update/github.py
@@ -44,16 +44,17 @@ class GitHub(object):
         if data is not None:
             kwargs["data"] = json.dumps(data)
 
         resp = requests.request(method, url, **kwargs)
 
         if 200 <= resp.status_code < 300:
             return resp.json()
         else:
+            print method, path, resp.status_code, resp.json()
             raise GitHubError(resp.status_code, resp.json())
 
     def repo(self, owner, name):
         """GitHubRepo for a particular repository.
 
         :param owner: String repository owner
         :param name: String repository name
         """
@@ -134,17 +135,17 @@ class PullRequest(object):
         if self._issue is None:
             self._issue = Issue.from_number(self.repo, self.number)
         return self._issue
 
     def merge(self):
         """Merge the Pull Request into its base branch.
         """
         self.repo.gh.put(self.path("merge"),
-                         {"merge_method": "rebase"},
+                         {"merge_method": "merge"},
                          headers={"Accept": "application/vnd.github.polaris-preview+json"})
 
 
 class Issue(object):
     def __init__(self, repo, data):
         """Object representing a GitHub Issue"""
         self.repo = repo
         self._data = data