rhodecode-enterprise-ce Commit - r3721:32426262

pull-request: calculate ancestor in the same way as creation mode !

marcink -

r3721:32426262 new-ui

parent child

rhodecode/model/pull_request.py

0 +2 -2

                          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)

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages