0

I am trying to unshelve some files in VS2010. This works perfectly, except when the file does not exist in my local workspace. When the change is "Add", it fails with the message : "The path xxx/xxxx has an incompatible pending change.".

My process is :

Get latest version recursively from server (replacing all files to ensure there's no pending changed in my workspace). Unshelve, selecting the specific files from the shelveset that I want.

Modifications work, but adding new files fails for all of them with the above error message.

Does anybody know what might be causing this?

Thanks a lot.

Simon Kiely
  • 5,880
  • 28
  • 94
  • 180
  • Possible duplicate: http://stackoverflow.com/questions/4054786/how-can-i-instruct-perforce-to-merge-instead-of-overwrite-or-revert-when-unshelv – Hans Passant Sep 19 '12 at 13:38

1 Answers1

1

You said you that you did a

Get latest version recursively from server (replacing all files to ensure there's no pending changed in my workspace)

But this would not undo an existing "Add" operation.

My guess is that if you check your workspace Pending Changes window, you will, in fact, have a pending add at that location (even though you do not necessarily have a file at that location).

Robert Horvick
  • 3,966
  • 21
  • 18