pmr

Merge ~stub/pmr:master into ~thomir-deactivatedaccount/pmr:master

  1. Git
  2. lp:~stub/pmr
  3. master
  4. Merge into master
Proposed by Stuart Bishop
Status: Merged
Merged at revision: 1240ef245fb5a0b63c9ba318dc59e1f1ec539791
Proposed branch: ~stub/pmr:master
Merge into: ~thomir-deactivatedaccount/pmr:master
Diff against target: 12 lines (+1/-0)
1 file modified
process-merge-requests (+1/-0)
Reviewer Review Type Date Requested Status
Thomi Richards Pending
Review via email: mp+303095@code.launchpad.net

Description of the change

Do not push merge if tests fail (lp:1612514)

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/process-merge-requests b/process-merge-requests
2index 633086f..60d7263 100755
3--- a/process-merge-requests
4+++ b/process-merge-requests
5@@ -192,6 +192,7 @@ def merge_git_proposal(branch_merge_proposal):
6 branch_merge_proposal.setStatus(
7 status='Needs review', revid=reviewed_revid)
8 _logger.error("Tests fail after merging")
9+ return
10 # Push to trunk
11 try:
12 sh('git', 'push', 'target',

Subscribers

People subscribed via source and target branches

to all changes: