# HG changeset patch # User Marcin Kuzminski # Date 2019-06-03 18:00:45 # Node ID 3242626203b29251394834e3893493c5c77f2d36 # Parent 0c0b5c69ca00cefa3abfa4f462e552d4a400a70a pull-request: calculate ancestor in the same way as creation mode ! diff --git a/rhodecode/model/pull_request.py b/rhodecode/model/pull_request.py --- a/rhodecode/model/pull_request.py +++ b/rhodecode/model/pull_request.py @@ -752,8 +752,8 @@ class PullRequestModel(BaseModel): target_commit.raw_id, source_commit.raw_id, source_repo, merge=True, pre_load=pre_load) - ancestor = target_repo.get_common_ancestor( - target_commit.raw_id, source_commit.raw_id, source_repo) + ancestor = source_repo.get_common_ancestor( + source_commit.raw_id, target_commit.raw_id, target_repo) pull_request.source_ref = '%s:%s:%s' % ( source_ref_type, source_ref_name, source_commit.raw_id)