# HG changeset patch # User Johannes Bornhold # Date 2016-06-08 22:19:16 # Node ID 14cb409dece56445e80d384626709aa56485ae26 # Parent bad7295203e7d85a0f0fdd37c00402e76b73e3e6 pull_request: Increase debug logging around merge. 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 @@ -396,10 +396,15 @@ class PullRequestModel(BaseModel): return commit_ids def merge(self, pull_request, user, extras): + log.debug("Merging pull request %s", pull_request.pull_request_id) merge_state = self._merge_pull_request(pull_request, user, extras) if merge_state.executed: + log.debug( + "Merge was successful, updating the pull request comments.") self._comment_and_close_pr(pull_request, user, merge_state) self._log_action('user_merged_pull_request', user, pull_request) + else: + log.warn("Merge failed, not updating the pull request.") return merge_state def _merge_pull_request(self, pull_request, user, extras):