Don't clobber shelvesets, unless the user asks for it.

2010-03-05 17:20:19 -05:00
parent 68457d3811
commit d79ca7bc72
1 changed files with 1 additions and 1 deletions
@@ -36,7 +36,7 @@ namespace Sep.Git.Tfs.Core
            {
                var shelveset = new Shelveset(_workspace.VersionControlServer, shelvesetName, _workspace.OwnerName);
                shelveset.Comment = _checkinOptions.CheckinComment;
-                _workspace.Shelve(shelveset, _workspace.GetPendingChanges(), ShelvingOptions.Replace);
+                _workspace.Shelve(shelveset, _workspace.GetPendingChanges(), _checkinOptions.Force ? ShelvingOptions.Replace : ShelvingOptions.None);
            }
        }