Resolve build errors introduced by #350

This commit is contained in:
Matt Burke
2013-09-12 08:29:12 -04:00
+4 -5
View File
@@ -213,10 +213,9 @@ namespace Sep.Git.Tfs.VsCommon
Workspace workspace;
if (!_workspaces.TryGetValue(remote.Id, out workspace))
{
Trace.WriteLine("Setting up a TFS workspace with subtrees at " + localDirectory);
var folders = mappings.Select(x => new WorkingFolder(x.Item1, Path.Combine(localDirectory, x.Item2))).ToArray();
var workspace = GetWorkspace(folders);
_workspaces.Add(remote.Id, workspace);
Trace.WriteLine("Setting up a TFS workspace with subtrees at " + localDirectory);
var folders = mappings.Select(x => new WorkingFolder(x.Item1, Path.Combine(localDirectory, x.Item2))).ToArray();
_workspaces.Add(remote.Id, GetWorkspace(folders));
Janitor.CleanThisUpWhenWeClose(() =>
{
Trace.WriteLine("Deleting workspace " + workspace.Name);
@@ -712,7 +711,7 @@ namespace Sep.Git.Tfs.VsCommon
});
}
workspace = GetWorkspace(gitRepositoryPath, projectPath);
workspace = GetWorkspace(new WorkingFolder(projectPath, gitRepositoryPath));
if (!Directory.Exists(directoryForBranch))
Directory.CreateDirectory(directoryForBranch);
workspace.PendAdd(directoryForBranch);