Skip to content

Commit

Permalink
MercurialExtractor: correctly calculate GCA between working directory…
Browse files Browse the repository at this point in the history
… and upstream
  • Loading branch information
bcully committed May 8, 2013
1 parent d81c6b3 commit 68b522b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion master/buildbot/clients/tryclient.py
Expand Up @@ -187,7 +187,7 @@ def getBaseRevision(self):
upstream = ""
if self.repository:
upstream = "r'%s'" % self.repository
d = self.dovc(["log", "--template", "{node}\\n", "-r", "limit(parents(outgoing(%s) and branch(parents())) or parents(), 1)" % upstream])
d = self.dovc(["log", "--template", "{node}\\n", "-r", "max(::. - outgoing(%s))" % upstream])
d.addCallback(self.parseStatus)
return d

Expand Down

0 comments on commit 68b522b

Please sign in to comment.