ols-jenkaas

Merge lp:~cjwatson/ols-jenkaas/log-approved-revision into lp:~ols-jenkaas-admins/ols-jenkaas/trunk

  1. log-approved-revision
  2. Merge into trunk
Proposed by Colin Watson
Status: Merged
Approved by: Adam Collard
Approved revision: 639
Merged at revision: 639
Proposed branch: lp:~cjwatson/ols-jenkaas/log-approved-revision
Merge into: lp:~ols-jenkaas-admins/ols-jenkaas/trunk
Diff against target: 12 lines (+2/-0)
1 file modified
olsjenkaas/commands.py (+2/-0)
To merge this branch: bzr merge lp:~cjwatson/ols-jenkaas/log-approved-revision
Reviewer Review Type Date Requested Status
Adam Collard (community) Approve
Review via email: mp+368310@code.launchpad.net

Commit message

Log the approved revision when merging an MP.

Description of the change

This is intended to make things at least a little less confusing when you run into the sort of situation described in bug 1699842.

To post a comment you must log in.
Revision history for this message
Adam Collard (adam-collard) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'olsjenkaas/commands.py'
2--- olsjenkaas/commands.py 2017-11-13 18:09:13 +0000
3+++ olsjenkaas/commands.py 2019-06-04 09:37:51 +0000
4@@ -478,6 +478,8 @@
5 logger.info('Getting {}'.format(target_url))
6 self.setup_merge_target(local_work_dir, target_url)
7 logger.info('Merging {}'.format(proposal.web_link))
8+ logger.info(
9+ 'Approved revision is {}'.format(proposal.reviewed_revid))
10 try:
11 merged = self.merge_proposed_branch(local_work_dir, proposal)
12 except errors.CommandError:

Subscribers

People subscribed via source and target branches