commit 8f27032b2aaf133892562f83314efa39a9c2353c
author Joachim Sauer <jsauer@google.com> Tue May 10 17:57:05 2016 +0100
committer Joachim Sauer <jsauer@google.com> Tue May 10 17:58:21 2016 +0100
tree f7a1cf862552cde3e02d72083790af013ab45a53
parent 7a133242429c2c29bd968d4b1fc5f7f3bb4375e8

Fix merging add/remove on same method.

Changes to methods are detected as both addition/removal and merged into
a single "change" entry in a separate step.  The code that searched for
the equivalent "remove" step only ever looked at the first removed
method with that name, ch caused the merging to change if several
methods with the same name were changed at once (for example several
overloads were precated at once).

Bug: 27582395
Change-Id: I9718709de4d5e70c291c92ca2801e922f98a39a1

src/jdiff/MergeChanges.java

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 @@
             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;