| commit | 3bfadd0f4253f5d30433b04691c35ef25bcfc4bd | |
| author | Robin Stocker <robin@nibor.org> | |
| Wed, 25 Sep 2013 22:45:22 +0000 (26 00:45 +0200) | ||
| committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | |
| Thu, 26 Sep 2013 19:18:00 +0000 (26 15:18 -0400) | ||
| tree | edcea33da1a83af9ca2f9ad04faf3572349e5c7f | treesnapshot (tar.gz zip) |
| parent | cbd0af1664fa3e4efd47745b14b28a619149ae54 | commitdiff |
Fix regression of switched sides in "Compare with Version in Ancestor"
In EGit 3.0, the "new" state was shown on the left and the "old" on the
right, which is consistent with other Eclipse usage, see bug 213780.
In the fix for bug 416808, the sides were switched (probably not
intentionally).
This restores the order and also renames the parameters in the compare
methods to be more clear. It's now also more consistent with how
includeLocal is handled, as local is shown on the left and uses the
"old" parameter for the right side.
Bug: 418029
Change-Id: I4288fac38a3681638601a8fd81f30f5210bdcaa3
Signed-off-by: Robin Stocker <robin@nibor.org>
In EGit 3.0, the "new" state was shown on the left and the "old" on the
right, which is consistent with other Eclipse usage, see bug 213780.
In the fix for bug 416808, the sides were switched (probably not
intentionally).
This restores the order and also renames the parameters in the compare
methods to be more clear. It's now also more consistent with how
includeLocal is handled, as local is shown on the left and uses the
"old" parameter for the right side.
Bug: 418029
Change-Id: I4288fac38a3681638601a8fd81f30f5210bdcaa3
Signed-off-by: Robin Stocker <robin@nibor.org>
| org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/CompareUtils.java | diffblobblamehistory | |
| org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitFileDiffViewer.java | diffblobblamehistory |