# HG changeset patch
# User Martin Bornhold <martin@rhodecode.com>
# Date 2016-10-23 12:37:19
# Node ID 4da21655a7b36e3692a6bd5b769b9bb2e5e4b8d1
# Parent  769466d27a9bc66f0df3ce39c09195a299e8a03c

pr-shadow: Set last merge revision on merge status update.

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
@@ -1006,11 +1006,11 @@ class PullRequestModel(BaseModel):
 
         # Do not store the response if there was an unknown error.
         if merge_state.failure_reason != MergeFailureReason.UNKNOWN:
-            pull_request._last_merge_source_rev = pull_request.\
-                source_ref_parts.commit_id
+            pull_request._last_merge_source_rev = \
+                pull_request.source_ref_parts.commit_id
             pull_request._last_merge_target_rev = target_reference.commit_id
-            pull_request._last_merge_status = (
-                merge_state.failure_reason)
+            pull_request._last_merge_status = merge_state.failure_reason
+            pull_request.last_merge_rev = merge_state.merge_commit_id
             Session().add(pull_request)
             Session().flush()