Merge pull request #13 from Techsola/fix_overwrites_from_other_branches

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

Author: jnm2

src/TfvcMigrator/Program.cs

@@ -367,6 +367,7 @@ pat is not null
         var builder = ImmutableDictionary.CreateBuilder<BranchIdentity, ImmutableArray<(string GitRepositoryPath, TfvcItem DownloadSource)>>();
 
         var itemsBuilder = ImmutableArray.CreateBuilder<(string GitRepositoryPath, TfvcItem DownloadSource)>();
+        var itemPaths = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
 
         foreach (var (branch, mapping) in branchMappingsInDependentOperationOrder)
         {
@@ -384,11 +385,17 @@ pat is not null
                 }
 
                 if (mapping.GetGitRepositoryPath(item.Path) is { } path)
+                {
+                    if (!itemPaths.Add(path))
+                        throw new InvalidOperationException("The same Git repository path is being added with two different TFVC sources.");
+
                     itemsBuilder.Add((path, item));
+                }
             }
 
             builder.Add(branch, itemsBuilder.ToImmutable());
             itemsBuilder.Clear();
+            itemPaths.Clear();
         }
 
         return builder.ToImmutable();

src/TfvcMigrator/RepositoryBranchMapping.cs

@@ -50,7 +50,7 @@ public RepositoryBranchMapping RenameRootDirectory(string oldPath, string newPat
         if (!PathUtils.IsAbsolute(newPath))
             throw new ArgumentException("New path must be absolute.", nameof(newPath));
 
-        if (!PathUtils.IsOrContains(oldPath, RootDirectory))
+        if (!PathUtils.IsOrContains(RootDirectory, oldPath))
             throw new InvalidOperationException("The rename does not apply to this mapping.");
 
         if (SubdirectoryMapping is not null)
@@ -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))