##// END OF EJS Templates
mercurial: fixed code for new ancestor code available in vcsserver.
marcink -
r1414:c758a5dd default
parent child Browse files
Show More
@@ -565,8 +565,7 b' class MercurialRepository(BaseRepository'
565 """
565 """
566 Return the common ancestor of the two revisions.
566 Return the common ancestor of the two revisions.
567 """
567 """
568 return self._remote.ancestor(
568 return self._remote.ancestor(revision1, revision2)
569 revision1, revision2).strip().split(':')[-1]
570
569
571 def _local_push(
570 def _local_push(
572 self, revision, repository_path, push_branches=False,
571 self, revision, repository_path, push_branches=False,
General Comments 0
You need to be logged in to leave comments. Login now