Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixed https://github.com/NuGet/Home/issues/2805 #608

Merged
merged 1 commit into from
Jun 7, 2016
Merged

fixed https://github.com/NuGet/Home/issues/2805 #608

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion src/NuGet.Clients/TeamFoundationServer/TFSSourceControlManagerProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ public override void PendDeleteFiles(IEnumerable<string> fullPaths, string root,
HashSet<string> filesToPendDelete = new HashSet<string>();
foreach (var fullPath in fullPaths)
{
if (File.Exists(fullPath))
if (File.Exists(fullPath) && IsSourceControlBound(fullPath))
{
filesToPendDelete.Add(fullPath);
}
Expand Down Expand Up @@ -213,6 +213,25 @@ public override void PendDeleteFiles(IEnumerable<string> fullPaths, string root,
}
}
}
else
{
var filePendingChanges = PrivateWorkspace.GetPendingChanges(filesToPendDelete.ToArray());

if (filePendingChanges.Any())
{
PrivateWorkspace.Undo(filePendingChanges);
}

foreach (var pendingChange in filePendingChanges)
{
if (pendingChange.IsAdd)
{
// If a file was marked for add, it does not have to marked for delete
// Since, all the pending changes on the file are undone, no action needed here
filesToPendDelete.Remove(pendingChange.LocalItem);
}
}
}

if (filesToPendDelete.Any())
{
Expand Down