Merge pull request #507 from spraints/pending-things

Don't update the file to latest on PendEdit.
This commit is contained in:
Matt Burke
2014-03-07 15:25:02 -05:00
+2 -2
View File
@@ -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
{
@@ -411,7 +412,6 @@ namespace Sep.Git.Tfs.VsCommon
_bridge.Unwrap<PolicyFailure>(policyOverrideInfo.Failures));
}
public ICheckinEvaluationResult EvaluateCheckin(TfsCheckinEvaluationOptions options, IPendingChange[] allChanges, IPendingChange[] changes,
string comment, string author, ICheckinNote checkinNote, IEnumerable<IWorkItemCheckinInfo> workItemChanges)
{
@@ -431,7 +431,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)