# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1178231083 18000
# Node ID 3b7e284b8f28bb89fcc3fbea97eafca94c0c75c3
# Parent  9fe267f77f56ff127cf7e65dc15dd9de71ce8ceb
merge: expand and simplify the invalid handling for directory moves

diff -r 9fe267f77f56 -r 3b7e284b8f28 mercurial/merge.py
--- a/mercurial/merge.py	Thu May 03 17:24:43 2007 -0500
+++ b/mercurial/merge.py	Thu May 03 17:24:43 2007 -0500
@@ -205,11 +205,14 @@
         elif dsrc in dirmove and dirmove[dsrc] != ddst:
             # files from the same directory moved to two different places
             invalid[dsrc] = True
-            del dirmove[dsrc]
         else:
             # looks good so far
             dirmove[dsrc + "/"] = ddst + "/"
 
+    for i in invalid:
+        if i in dirmove:
+            del dirmove[i]
+
     del d1, d2, invalid
 
     if not dirmove: