# HG changeset patch # User Marcin Kuzminski # Date 2017-02-07 23:16:46 # Node ID c758a5ddd76d52d373e5bef085cc9d5e67bba1ab # Parent 44a048ecac4ff4f33b1417cd65dc87a214224141 mercurial: fixed code for new ancestor code available in vcsserver. diff --git a/rhodecode/lib/vcs/backends/hg/repository.py b/rhodecode/lib/vcs/backends/hg/repository.py --- a/rhodecode/lib/vcs/backends/hg/repository.py +++ b/rhodecode/lib/vcs/backends/hg/repository.py @@ -565,8 +565,7 @@ class MercurialRepository(BaseRepository """ Return the common ancestor of the two revisions. """ - return self._remote.ancestor( - revision1, revision2).strip().split(':')[-1] + return self._remote.ancestor(revision1, revision2) def _local_push( self, revision, repository_path, push_branches=False,