From cd13fc1dbf6d7f97cb02f4be78426b8e59e49296 Mon Sep 17 00:00:00 2001
From: "bugreport%peshkin.net"
 <bugreport%peshkin.net@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 12 May 2004 23:57:31 +0000
Subject: [PATCH] Bug 226411: make DiffStrings handle fields with duplicate
 values patch by jouni r=joel,myk a=justdave

git-svn-id: svn://10.0.0.236/trunk@156330 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/bugzilla/globals.pl | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/mozilla/webtools/bugzilla/globals.pl b/mozilla/webtools/bugzilla/globals.pl
index 055584f7ef6..7439940c350 100644
--- a/mozilla/webtools/bugzilla/globals.pl
+++ b/mozilla/webtools/bugzilla/globals.pl
@@ -1404,20 +1404,20 @@ sub DiffStrings {
     my @old = split(" ", $oldstr);
     my @new = split(" ", $newstr);
 
-    my (@remove, @add) = ();
+    # For each pair of (old, new) entries: 
+    # If they're equal, set them to empty. When done, @old contains entries
+    # that were removed; @new contains ones that got added.
 
-    # Find values that were removed
-    foreach my $value (@old) {
-        push (@remove, $value) if !grep($_ eq $value, @new);
+    foreach my $oldv (@old) {
+      foreach my $newv (@new) {
+        next if ($newv eq '');
+        if ($oldv eq $newv) {
+          $newv = $oldv = '';
+        }
+      }
     }
-
-    # Find values that were added
-    foreach my $value (@new) {
-        push (@add, $value) if !grep($_ eq $value, @old);
-    }
-
-    my $removed = join (", ", @remove);
-    my $added = join (", ", @add);
+    my $removed = join (", ", grep { $_ ne '' } @old);
+    my $added = join (", ", grep { $_ ne '' } @new);
 
     return ($removed, $added);
 }