Stack Overflow
Stack Overflow

Questions tagged [unshelve]

Questions regarding to undo shelve operations primarily on changes in version control systems such as TFS

50 questions
5
votes
2 answers

TFS : Can a shelveset be restored to another location?

I have the following scenario: A user shelves some changes. Time goes by and a new branch of the product is created. Later, it is determined that the shelveset contains code, that we will need in the new branch. By default; Visual Studio can only…
driis
  • 161,458
  • 45
  • 265
  • 341
5
votes
1 answer

Unshelve a file which is in exclusive check out in Perforce/P4

Perforce noob here - I have a file on a shelf which I want to unshelve to run a few things, however the file is exclusively checked out on another machine. Ideally what I want to do is unshelve the file locally, do a few things, then toss out my…
shayaan
  • 1,482
  • 1
  • 15
  • 32
5
votes
1 answer

Is there a way to get a mercurial shelf back after a merge mistake?

When I unshelve, it uses mercurial's merge capability, but I'm not seeing any way to get back the original shelved patch and redo things if I've completed the merge with an error. Aside from searching backup drives, is there any way to do that? …
Joshua Goldberg
  • 5,059
  • 2
  • 34
  • 39
4
votes
1 answer

TFS 2017/VS 2017 unshelve to different branch, alternatively create a branch from "Main" with saved, uncommitted changes

This describes a scenario that I find myself in now and then when I realize I should have worked in a development branch in TFS. Then I would like to shelve my changes and unshelv into a dev branch, alternatively create a branch from "Main" with…
Mats Isaksson
  • 1,939
  • 2
  • 14
  • 18
4
votes
1 answer

hg shelve installed but hg: unknown command 'unshelve'

I installed the shelve extension for hg by adding 'shelve=' to [extensions]. I can verify this by running 'hg help extensions' which has the following in the output: enabled extensions: extdiff command to allow external programs to compare…
Josh Nankin
  • 2,518
  • 4
  • 28
  • 45
4
votes
1 answer

Perforce - unshelve files into another directory

I have two directories into the same workspace, I shelved some files into a changelist in the first directory and now I want to unshelve them into the second.. I tried this command: p4 -c my_workspace unshelve -s 17654070 -n -b…
Marco A.
  • 43,032
  • 26
  • 132
  • 246
3
votes
2 answers

How to get the correct Version when unshelving older Shelvesets in TFS?

I just wanted to unshelve a shelveset which has been added some days ago. Meanwhile, somebody else has successfully checked in new versions of files contained in the shelveset. As there exists a conflict in my files between the latest version and…
ElGaucho
  • 408
  • 2
  • 14
3
votes
1 answer

TFS Power tools Migrate doesn't actually migrate

I would like to migrate a shelveset from one branch to another. Here is my command: tfpt unshelve MigrateShelf /migrate /source:"$/Code/OldBranch/Source" /target:"$/Code/NewBranch/Source" When I execute it, I the window pops up, but it is still…
McKay
  • 12,334
  • 7
  • 53
  • 76
3
votes
1 answer

How do I checkout a perforce shelf at the changelist it was shelved at?

I have a perforce shelf that's CL 1000. It was shelved by someone else at some unknown CL X. I'm at CL 2000. I'd like to sync to whatever X is and unshelf 1000 so my code is exactly the same as when it was shelved. How do I do this?
idbrii
  • 10,975
  • 5
  • 66
  • 107
3
votes
1 answer

Shelves in Tortoise and Mercurial command line don't seem to interoperate?

If I add something to a Mercurial shelf on the command line: C:> hg shelve ... when I then look in TortoiseHG Workbench under the Repository > Shelve > menu, there is NO new corresponding entry (in the dropdown). Likewise, if I do the opposite and…
StayOnTarget
  • 11,743
  • 10
  • 52
  • 81
3
votes
1 answer

unshelving team explorer everywhere

I'm trying to unshelve a shelveset using the command line with team explorer everywhere. I keep receiving this error: An error occurred: TF400016: Unshelve with Merge is not supported on the version of Team Foundation Server on which your team…
Connor Pearson
  • 63,902
  • 28
  • 145
  • 142
3
votes
3 answers

TFS Meltdown - How can I recover shelved changes

I had my working folder set to a RAM drive. During the night there was an extended power outage, the UPS ran out and my machine went down. Thankfully I shelved my changes before I went home and that shelveset is visible in Team Explorer. The…
immutabl
  • 6,857
  • 13
  • 45
  • 76
3
votes
1 answer

is there a way to manually apply the diffs in hg unshelve -i output?

hg shelve did it again - even after applying the patch described in hg unshelve not working (which worked happily for about a month), shelve just "lost" all my changes again. I see the name of my shelve when running hg shelve -l, but when I do hg…
Jer
  • 5,468
  • 8
  • 34
  • 41
2
votes
3 answers

p4 unshelve doesn't bring new added files

It seems that p4 unshelve -s changelist doesn't bring the new source files that are added in the shelved changelist. Two questions: Am I missing something? Any workaround? Thanks.
user3689963
  • 115
  • 1
  • 6
2
votes
2 answers

Undo TFS Unshelve

I am using Visual Studio 2015. Version of TFS is 2012 (Version 11.0.51106.1). Is there a way to undo unshelve, other's user shelveset, to have situation as before unshelve command?
ingbabic
  • 301
  • 3
  • 10
1
2
3 4