Geek asks and answers

Git -tfs: A deferred pending file change is required.

I am trying to execute git-tfs and I am trying to disable shelveset by doing the following:

git tfs unshelve "Shelveset Name" shelf

I get the following error:

A shelved pending change on a file is required: $/path/to/dir/deleted

"deleted" is the directory that has been deleted on the shelf.

I am just starting with git-tfs. I need to check this shelves, so for now I can only do this with TFS, but if possible, I would like to know what could happen and avoid it if possible.

Thanks for any help.

+6
source share
3 answers

This error message is not one of git-tfs, but one of TFS (I just looked at the source code).

, git-tfs shelveset, , git-tfs, . - , :( , !

, , , , "". , , (, , , , ), !

, , git commit .

shelveset unhelve! , (, git , ).

, ...

TFS :(

edit: , , git-tfs , , .

edit2: , --force

+4

, TFS shelvesets, . , :

  • Unshelve Visual Studio (2012)
  • ( VS2012)
  • git-tfs, Git
  • (),

, , . TFS Git, , TFS .

+2

Now you can make git-tfs ignore these errors.

https://github.com/git-tfs/git-tfs/blob/master/doc/commands/unshelve.md

 --force   Get as much of the Shelveset as possible, and
           log any other errors

https://github.com/git-tfs/git-tfs/issues/419

+2
source

More articles:


All Articles