Launchpad itself

Merge lp:~cjwatson/launchpad/git-fix-merge-diff-direction into lp:launchpad

  1. git-fix-merge-diff-direction
  2. Merge into devel
Proposed by Colin Watson
Status: Merged
Merged at revision: 17473
Proposed branch: lp:~cjwatson/launchpad/git-fix-merge-diff-direction
Merge into: lp:launchpad
Diff against target: 14 lines (+2/-2)
1 file modified
lib/lp/code/model/diff.py (+2/-2)
To merge this branch: bzr merge lp:~cjwatson/launchpad/git-fix-merge-diff-direction
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+257955@code.launchpad.net

Commit message

Fix direction of Git merge diffs.

Description of the change

Fix direction of Git merge diffs.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/code/model/diff.py'
2--- lib/lp/code/model/diff.py 2015-04-30 12:38:39 +0000
3+++ lib/lp/code/model/diff.py 2015-04-30 19:18:28 +0000
4@@ -460,8 +460,8 @@
5 # XXX cjwatson 2015-04-30: Add prerequisite handling once turnip
6 # supports it.
7 response = hosting_client.getMergeDiff(
8- path, bmp.source_git_ref.commit_sha1,
9- bmp.target_git_ref.commit_sha1)
10+ path, bmp.target_git_ref.commit_sha1,
11+ bmp.source_git_ref.commit_sha1)
12 source_revision_id = bmp.source_git_ref.commit_sha1
13 target_revision_id = bmp.target_git_ref.commit_sha1
14 if bmp.prerequisite_git_ref is not None: