diff options
| author | Joachim Sauer <jsauer@google.com> | 2016-05-10 17:40:45 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-10 17:40:45 +0000 |
| commit | 62f4ca1f64eaeb0896416949d6120b912ac67d3b (patch) | |
| tree | f7a1cf862552cde3e02d72083790af013ab45a53 | |
| parent | 7a133242429c2c29bd968d4b1fc5f7f3bb4375e8 (diff) | |
| parent | 98ed536fd800bf9ac02a9983da6dc08356a64fa3 (diff) | |
| download | jdiff-62f4ca1f64eaeb0896416949d6120b912ac67d3b.tar.gz | |
Fix merging add/remove on same method. am: 8f27032b2a
am: 98ed536fd8
* commit '98ed536fd800bf9ac02a9983da6dc08356a64fa3':
Fix merging add/remove on same method.
Change-Id: I454844d92904429ced507c6e014ff093ccb26518
| -rwxr-xr-x | src/jdiff/MergeChanges.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/jdiff/MergeChanges.java b/src/jdiff/MergeChanges.java index d253ff4..7ef0a84 100755 --- a/src/jdiff/MergeChanges.java +++ b/src/jdiff/MergeChanges.java @@ -210,9 +210,10 @@ class MergeChanges { for (int i = startAdded; i <= endAdded; i++) { MethodAPI addedMethod2 = (MethodAPI)(classDiff.methodsAdded.get(i)); if (addedMethod2.inheritedFrom_ == null && - removedMethod.equalSignatures(addedMethod2)) + removedMethod.equalSignatures(addedMethod2)) { addedIdx = i; break; + } } if (addedIdx == -1) return; |