hg unshelve not working

Posted by shanebonham on Stack Overflow See other posts from Stack Overflow or by shanebonham
Published on 2010-05-06T20:23:27Z Indexed on 2010/05/06 20:28 UTC
Read the original article Hit count: 204

Filed under:

mercurial

|

unshelve

|

shelve

|

hg

Our team is just getting started with Mercurial. One of the first things we've started to play with is hg shelve. Locally, I have no problem shelving changes. It all works perfectly from what I can tell. However, when I try to unshelve, I get the restoring backup files message, but when I run hg diff, there are no changes, and my changes are missing from the code. If i do hg unshelve -i I can see the diff, but again, trying to unshelve seems to have no effect.

I've been trying to test it with some very simple changes that shouldn't be a problem in terms of conflicts, e.g. adding a test comment. I should note that I've tried hg unshelve -f after which it says unshelve completed but again, my changes are not restored.

Any ideas what I am doing wrong?

If it matters: Mercurial Distributed SCM (version 1.5.1+20100405)

© Stack Overflow or respective owner

Related posts about mercurial

Mercurial fails while commiting/updating/etc. using Mercuriual+TrueCrypt+MAC

as seen on Stack Overflow - Search for 'Stack Overflow'
While trying to work with Mercurial on project located on TrueCrypt partition I always get en error as follows: ** unknown exception encountered, details follow ** report bug details to http://mercurial.selenic.com/bts/ ** or [email protected] ** Mercurial Distributed SCM (version 1.5.2+20100502) **… >>> More
OS X, Mercurial and MediaTemple problem

as seen on Stack Overflow - Search for 'Stack Overflow'
I've installed Mercurial per MT's knowledge base file here. Working with it server side using ssh from my Mac works fine. I can initialize repositories and the like, but pulling from the server or pushing from my Mac produces an error I don't understand. Here's what I get when call hg push from… >>> More
Mercurial to Mercurial to Subversion Workflow Problem

as seen on Stack Overflow - Search for 'Stack Overflow'
We're migrating from Subversion to Mercurial. To facilitate the migration, we're creating an intermediate Mercurial repository that is a clone of our Subversion repository. All developers will be begin switching over to the Mercurial repository, and we'll periodically push changes from the intermediate… >>> More
How do I configure Mercurial to use environment variables in mercurial.ini

as seen on Stack Overflow - Search for 'Stack Overflow'
How can I modify the mercurial.ini file to include an environment variable such as %userprofile%. Specific situation: I am learning to use Mercurial. I have modified the [ui] section of Mercurial.ini (in my home path) to include: ignore = c:\users\user\.hgignore Where user is my username literal… >>> More
Mercurial: Problem converting Windows cvs repository to mercurial

as seen on Stack Overflow - Search for 'Stack Overflow'
I’m trying to convert an existing Windows CVS repository to Mercurial and getting the following response and error: C:\Windows\system32>hg convert c:\users\jeff\webs\shelter-cvs\shelter assuming destination shelter-hg initializing destination shelter-hg repository connecting to :local:c:\cvs abort:… >>> More

Related posts about unshelve

hg unshelve not working

as seen on Stack Overflow - Search for 'Stack Overflow'
Our team is just getting started with Mercurial. One of the first things we've started to play with is hg shelve. Locally, I have no problem shelving changes. It all works perfectly from what I can tell. However, when I try to unshelve, I get the restoring backup files message, but when I run hg diff… >>> More
TF203015 The Item $/path/file has an incompatible pending change. While trying to unshelve.

as seen on Stack Overflow - Search for 'Stack Overflow'
I'm using Visual Studio 2010 Pro against Team Server 2010 and I had my project opened (apparently) as a solution from the repo, but I should've opened it as "web site". I found this out during compile, so I went to shelve my new changes and deleted the project from my local disk, then opened the project… >>> More
Unshelving in TFS: What does it mean?

as seen on Stack Overflow - Search for 'Stack Overflow'
Here's the part I get: When you shelve in TFS, it makes a server copy of the changes so they are not lost, but does not check them into the source code trunk/branch you are working on. Question: Under what circumstances would you use the "unshelve" feature? Does it mean it will remove the shelveset… >>> More
Shelving – What is it – and more importantly, can it help me?

as seen on Geeks with Blogs - Search for 'Geeks with Blogs'
Since we shifted to TFS we’ve had the ability to perform what is known as ‘shelving’. Shelving (whilst not a wholly new topic in the world of SCC) is new to us, and didn’t exist in our previous SCC solution – SVN. Soo… what is it? What? Shelving is a way to check-in but not check-in your code. By… >>> More
Release Notes for 10/04/2012

as seen on Code Plex - Search for 'Code Plex'
Below are the release notes from this week's deployment. Upgrade to TFS 2012 We upgraded our TFS infrastructure earlier this week. This means you can now take advantage of several improvements when you are using Visual Studio 2012, such as Local Workspaces, merge on unshelve, rollback within VS UI… >>> More