Skip to content

Commit c0ffffe

Browse files
committed
Unshelve: give some help on how to unshelve on current commit
when we could not unshelve because the parent changeset is not in the repository
1 parent 805353a commit c0ffffe

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

GitTfs/Core/GitTfsRemote.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -750,8 +750,12 @@ public void Unshelve(string shelvesetOwner, string shelvesetName, string destina
750750
if (ch == null)
751751
{
752752
if (!force)
753-
throw new GitTfsException("ERROR: Parent changeset C" + parentId + " not found."
754-
+ " Try fetching the latest changes from TFS");
753+
throw new GitTfsException("ERROR: Parent changeset C" + parentId + " not found.", new[]
754+
{
755+
"Try fetching the latest changes from TFS",
756+
"Try applying the shelveset on the currently checkouted commit using the '--force' option"
757+
}
758+
);
755759
stdout.WriteLine("warning: Parent changeset C" + parentId + " not found."
756760
+ " Trying to apply the shelveset on the current commit...");
757761
rootCommit = Repository.GetCurrentCommit();

0 commit comments

Comments
 (0)