launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging lp:~cjwatson/launchpad/git-fix-merge-diff-direction into lp:launchpad.

Commit message:
Fix direction of Git merge diffs.

Requested reviews:
  Colin Watson (cjwatson)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/git-fix-merge-diff-direction/+merge/257955

Fix direction of Git merge diffs.
-- 
Your team Launchpad code reviewers is subscribed to branch lp:launchpad.

=== modified file 'lib/lp/code/model/diff.py'
--- lib/lp/code/model/diff.py	2015-04-30 12:38:39 +0000
+++ lib/lp/code/model/diff.py	2015-04-30 19:18:28 +0000
@@ -460,8 +460,8 @@
             # XXX cjwatson 2015-04-30: Add prerequisite handling once turnip
             # supports it.
             response = hosting_client.getMergeDiff(
-                path, bmp.source_git_ref.commit_sha1,
-                bmp.target_git_ref.commit_sha1)
+                path, bmp.target_git_ref.commit_sha1,
+                bmp.source_git_ref.commit_sha1)
             source_revision_id = bmp.source_git_ref.commit_sha1
             target_revision_id = bmp.target_git_ref.commit_sha1
             if bmp.prerequisite_git_ref is not None: