--- _darcs/current/tools/darcs	2006-06-18 01:24:03.000000000 +0200
+++ tools/darcs	2006-08-05 13:09:13.000000000 +0200
@@ -161,11 +161,11 @@
     $raws{$patch} .= $_;
     $l = $_;
     $l =~ s/\.\///g;
-    if($l =~ /adddir (.*)\n/) { push @{$files{$patch}}, "$1 " }
-    if($l =~ /addfile (.*)\n/) { push @{$files{$patch}}, "$1 " }
-    if($l =~ /rmdir (.*)\n/) { push @{$files{$patch}}, "$1 " }
-    if($l =~ /rmfile (.*)\n/) { push @{$files{$patch}}, "$1 " }
-    if($l =~ /binary (.*)\n/) { push @{$files{$patch}}, "$1 " }
+    if($l =~ /adddir (.*)\n/) { push @{$files{$patch}}, "$1 " if grep {!/^$1/} @{$files{$patch}} }
+    if($l =~ /addfile (.*)\n/) { push @{$files{$patch}}, "$1 " if grep {!/^$1/} @{$files{$patch}} }
+    if($l =~ /rmdir (.*)\n/) { push @{$files{$patch}}, "$1 " if grep {!/^$1/} @{$files{$patch}} }
+    if($l =~ /rmfile (.*)\n/) { push @{$files{$patch}}, "$1 " if grep {!/^$1/} @{$files{$patch}} }
+    if($l =~ /binary (.*)\n/) { push @{$files{$patch}}, "$1 " if grep {!/^$1/} @{$files{$patch}} }
     if($l =~ /hunk (.*)\n/) {
       $m = $1;
       $m .= "\n";
@@ -174,12 +174,12 @@
       $m =~ s/[0-9]\n/\n/;
       $m =~ s/[0-9]\n/\n/;
       $m =~ s/ \n//;
-      push @{$files{$patch}}, "$m ";
+      push @{$files{$patch}}, "$m " if grep {!/^$m/} @{$files{$patch}};
     }
     if($l =~ /move (.*)\n/) {
       $m = $1;
       foreach(split(/ /, $m)) {
-        push @{$files{$patch}}, "$_ ";
+        push @{$files{$patch}}, "$_ " if grep {!/^$_/} @{$files{$patch}};
       }
     }
     last if (/^}$/);