From 5c11b49730b6df5895b87803dd606f954a3216e9 Mon Sep 17 00:00:00 2001 From: Matt Burke Date: Tue, 3 Dec 2013 15:26:57 -0500 Subject: [PATCH] Don't update the file to latest on PendEdit. --- GitTfs.VsCommon/Wrappers.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GitTfs.VsCommon/Wrappers.cs b/GitTfs.VsCommon/Wrappers.cs index ddba56e6..119fa8bd 100644 --- a/GitTfs.VsCommon/Wrappers.cs +++ b/GitTfs.VsCommon/Wrappers.cs @@ -8,6 +8,7 @@ using Microsoft.TeamFoundation.VersionControl.Client; using Sep.Git.Tfs.Core; using Sep.Git.Tfs.Core.TfsInterop; using Sep.Git.Tfs.Util; +using Microsoft.TeamFoundation.VersionControl.Common; namespace Sep.Git.Tfs.VsCommon { @@ -416,7 +417,6 @@ namespace Sep.Git.Tfs.VsCommon _bridge.Unwrap(policyOverrideInfo.Failures)); } - public ICheckinEvaluationResult EvaluateCheckin(TfsCheckinEvaluationOptions options, IPendingChange[] allChanges, IPendingChange[] changes, string comment, string author, ICheckinNote checkinNote, IEnumerable workItemChanges) { @@ -436,7 +436,7 @@ namespace Sep.Git.Tfs.VsCommon public int PendEdit(string path) { - return _workspace.PendEdit(path); + return _workspace.PendEdit(new string[] { path }, RecursionType.None, null, LockLevel.Unchanged, false, PendChangesOptions.ForceCheckOutLocalVersion); } public int PendDelete(string path)