Fix overwrites from files in the original branch which causes changes in the current branch to be missed until the next commit

jnm2 · jnm2 · commit 75d5fc7b7770 · 2023-05-06T19:51:23.000-04:00
diff --git a/src/TfvcMigrator/RepositoryBranchMapping.cs b/src/TfvcMigrator/RepositoryBranchMapping.cs
@@ -73,7 +73,7 @@ public RepositoryBranchMapping WithSubdirectoryMapping(string branchDirectory, s
 
         if (SubdirectoryMapping is var (branch, target))
         {
-            if (PathUtils.IsOrContains(itemPath, target))
+            if (PathUtils.IsOrContains(target, itemPath))
                 return null;
 
             if (PathUtils.IsOrContains(branch, itemPath))

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public RepositoryBranchMapping WithSubdirectoryMapping(string branchDirectory, s`
`73`	`73`
`74`	`74`	`if (SubdirectoryMapping is var (branch, target))`
`75`	`75`	`{`
`76`		`- if (PathUtils.IsOrContains(itemPath, target))`
	`76`	`+ if (PathUtils.IsOrContains(target, itemPath))`
`77`	`77`	`return null;`
`78`	`78`
`79`	`79`	`if (PathUtils.IsOrContains(branch, itemPath))`