From cf7371f5f2636b71ceb572002161901ee5cac5a2 Mon Sep 17 00:00:00 2001 From: Philippe Miossec Date: Thu, 12 Sep 2013 14:07:03 +0200 Subject: [PATCH 1/2] Correction build broken by subtree merge --- GitTfs.VsCommon/TfsHelper.Common.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/GitTfs.VsCommon/TfsHelper.Common.cs b/GitTfs.VsCommon/TfsHelper.Common.cs index 980f321e..5a8bf35d 100644 --- a/GitTfs.VsCommon/TfsHelper.Common.cs +++ b/GitTfs.VsCommon/TfsHelper.Common.cs @@ -215,8 +215,7 @@ namespace Sep.Git.Tfs.VsCommon { 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); + _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); From d745a9052f011f8bd9062f67353c15d974cded61 Mon Sep 17 00:00:00 2001 From: Philippe Miossec Date: Thu, 12 Sep 2013 14:09:56 +0200 Subject: [PATCH 2/2] Correction tabs in spaces --- GitTfs.VsCommon/TfsHelper.Common.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GitTfs.VsCommon/TfsHelper.Common.cs b/GitTfs.VsCommon/TfsHelper.Common.cs index 5a8bf35d..eb0ba308 100644 --- a/GitTfs.VsCommon/TfsHelper.Common.cs +++ b/GitTfs.VsCommon/TfsHelper.Common.cs @@ -213,8 +213,8 @@ 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(); + 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(() => {