migrate_tree.pl : Check target first when creating new files.

diff --git a/pwx/last_mutual_commits.csv b/pwx/last_mutual_commits.csv
index ad491b88349f28b3c066d89abcf1487c21b6bb41..92788d9f7028401c9d5d478c64d0a48feb612178 100644 (file)
--- a/pwx/last_mutual_commits.csv
+++ b/pwx/last_mutual_commits.csv
@@ -11,4 +11,4 @@
 ../systemd-upstream master      265710c20 src-efaa3176a x
 ../systemd-upstream v234        d6d0473dc src-782c925f7 x
 ../systemd-upstream v236        83fefc888 src-f78a88bec x
-../systemd-upstream v237        a327431bd src-6d8c71eb8 tgt-af44d5dfa
+../systemd-upstream v237        7629744a3 src-6d8c71eb8 tgt-b7e108921

diff --git a/pwx/migrate_tree.pl b/pwx/migrate_tree.pl
index df81c40f6f339285fb29ec1d4fdc0a3c7aff3388..c5892c7178d39bf3399ac269e7dcfadce6793aea 100755 (executable)
--- a/pwx/migrate_tree.pl
+++ b/pwx/migrate_tree.pl
@@ -868,10 +868,9 @@ sub rework_patch {
                # The determination what is valid is different for whether this is
                # the modification of an existing or the creation of a new file
                if ($isNew) {
-                       defined( $hDirectories{ dirname($src) } ) and $real = $src or
-                       defined( $hDirectories{ dirname($tgt) } ) and $real = $tgt;
+                       defined( $hDirectories{ dirname($tgt) } ) and $real = $tgt or
+                       defined( $hDirectories{ dirname($src) } ) and $real = $src;
                } else {
-
                        # Try the renamed first, then the non-renamed
                        defined( $hFiles{$tgt} ) and $real = $tgt
                          or defined( $hFiles{$src} )