Questions tagged [shelving]

The shelving operation in source / version control tools lets you set your pending changes aside temporarily and restore them at a later time. It is useful in situations where you need to switch tasks, but are not ready to commit your current work.

34 questions
8
votes
2 answers

What would be the Subversion equivalent to TFS shelving?

We are moving from TFS to Subversion. A colleague remarked that he will be very disappointed if he loses the ability to do shelving. In TFS, it is possible to create a set of files to be preserved under a single name. The files are saved in the…
Robert White
  • 711
  • 6
  • 11
6
votes
1 answer

Mercurial: shelve vs. mq

I have been using mercurial for a little while, and have been slowly learning it's features. A while ago I learned about shelves, and have been using them happily. Now I am trying to understand patch queues, but from what I read, they sound very…
Baruch
  • 20,590
  • 28
  • 126
  • 201
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

Shelving and reviewing code in TortoiseSVN

I want to shelve code changes in SVN for the main purpose of code reviews. I'm having a few problems and was hoping someone could check to see if I'm doing anything wrong. I have set up the repository to have this extra structure: /shelves …
user2020792
  • 239
  • 1
  • 11
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
3 answers

attic-shelve versus shelve. Are they complementary?

I'm new to Mercurial and I'm a bit confused about how to stash changes like git. I dug into SO and found some use attic extension while others use shelve extension. Are there any reason I should use one instead of the other?. Are they…
Pablo Burgos
  • 1,194
  • 1
  • 10
  • 21
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
0 answers

Inability to Shelve with SQL Query Windows Unsaved in Visual Studio

As I was wrapping up my work-day, I wanted to shelve my changes in TFS before I went home as I encourage all developers to do. All my changes were saved to disk, and I had a number of SQL query windows open that I'd been using as scratch-pads to…
Moo-Juice
  • 38,257
  • 10
  • 78
  • 128
2
votes
2 answers

Question about shelving/unshelving in TFS

when you shelve / unshelve items in TFS, is it private? That is, can other people see what i've shelved and even unshelve that? If it is public, is it possible to make it private?
Pure.Krome
  • 84,693
  • 113
  • 396
  • 647
2
votes
1 answer

TortoiseHg shelve-update-unshelve shortcut

Using TortoiseHg Workbench, almost every time I pull from a remote repository, I have uncommitted code changes so that I need to shelve them before I update and then unshelve them again. Is there a way to do this all in one click? I seem to remember…
whistling_marmot
  • 3,561
  • 3
  • 25
  • 39
2
votes
2 answers

Mercurial: How can a I make a snapshot of my working directory without doing a changeset?

While working on a new feature I arrive at a point where it roughly works, but is still not at a point where I want to create a changeset. I would however create a "restore point" or a "snapsnot" so I can come back to this roughly working version of…
citykid
  • 9,916
  • 10
  • 55
  • 91
1
vote
1 answer

hg shelve created a commit, I don't understand

I'm a bit confused by hg shelve because the documentation is rather sparse. Somehow I got a commit in my log of the form: changeset: 29:ad47ed1ca915 parent: 27:afca280f2884 user: shelve@localhost date: Wed Jun 08 15:30:36 2016…
CrazyCasta
  • 26,917
  • 4
  • 45
  • 72
1
vote
1 answer

How to access shelved source code from diff machine?

I shelved some source code from one machine into TFS. Is there then a way to access that code from another machine via TFS, or is it only accessible from the machine from which it was shelved?
Scott Marlowe
  • 7,915
  • 10
  • 45
  • 51
0
votes
2 answers

Is there a way to clear all of my TFS pending changes?

If I unshelve a shelveset, the "Pending Changes" toolwindow in Visual Studio will restore the files, the commit comment, and the associated work items I had set up when I shelved. If I change my mind and decide I'm not ready to work on this…
Joe White
  • 94,807
  • 60
  • 220
  • 330
0
votes
1 answer

Meaning of 'theirs' and 'mine' in unshelve conflict

For partitioning a bigger commit into compilable portions, I decided to shelve[1] all files but one unit (say A.cpp and A.h). To get rid of trivial errors in a related file (say R.cpp) that was also shelved, I made a few changes to it. After fixing…
Wolf
  • 9,679
  • 7
  • 62
  • 108