搁置在 TortoiseSVN 中？
I've moved from TFS to SVN (TortoiseSVN) with my current company. I really miss the "Shelve" feature of TFS. I've read various articles on how to "Shelve" with SVN, but I've read nothing that gives a very simple experience to "shelve" work.
Ideally, I'd like extra items added to the TortoiseSVN context menu - "Shelve" & "Unshelve". "Shelve" would remove the current shelve-set, and upload the working directory under a suitable path defined by user options. "Unshelve" would merge the set with the working copy.
Does something like this exist? Can anyone suggest any ways to "hack" this feature in the GUI?
Note: The following link doesn't really achieve the user experience I was looking for:
One of the greatest things about TFS Shelve is how easy it is to use...
I don't believe that SVN has this feature built into the server product. I also don't believe anything like this emulated in any clients that I have used, including TortoiseSVN.
To get around this problem, I have resorted to using a DVCS such as Git or Mercurial, to allow me to branch/merge/shelve locally before pushing the content back to SVN. It's arguably a bit of a kludge, but it works really well.
Shelving in SVN is starting to roll out with version 1.10, see Release Notes
Git also works same way. TFS is best in this case
If you understand how SVN branches work, emulating Shelve in SVN is a no-brainer:
Create a branch in the repository (on the server) Switch your local copy to it Commit your changes to the new branch Switch your local copy back to the trunk
When you are ready to get back to your shelved changes ("unshelve"), simply merge the shelf branch back to your local copy.
If you don't know command-line SVN nor Tortoise SVN well enough to do the above, here's a super detailed step-by-step instruction on how to do it in Tortoise SVN:
Do "SVN Update" to update your working copy to the latest version of the trunk. This way the only differences between your local copy and the trunk are your changes. From the context menu select "Branch / Tag" "HEAD version in the repository" option is selected by default. Keep that. Change the "To Url" to specify branch name, e.g. http://server/repository/project1/branches/shelf1 Check the "Switch working copy to new branch/tag" box Click Ok to create the branch and switch to it Do "SVN Commit..." and commit your changes to the newly created branch From the context menu select "Switch..." Change the "To URL" to the trunk URL e.g. http://server/repository/project1/trunk Click Ok to switch back to the trunk
See this link for even more details and the command-line equivalent of the above:
Shelves in Subversion
TortoiseSVN 1.10 now supports shelving: https://tortoisesvn.net/docs/nightly/TortoiseSVN_en/tsvn-dug-shelving.html
TortoiseSVN feature or Subversion's one? I can't find any mention of shelving in svn
Another option is to use the 'Create patch' facility in TortoiseSvn to create a patch file and revert changes. The patch file can later be reapplied to get back where you were.
You may still end up with some sticky merges if you have to update the working copy revision though.
SVN have upgraded the shelving https://subversion.apache.org/docs/release-notes/1.11.html#shelving
The kinds of change you can shelve are committable changes to files and properties, except the following kinds which are not yet supported: copies and moves creating and deleting directories
You can use a DVCS but in a way this is a kludge. 'Shelving' in a DVCS stores your changes locally only. Its useful only if you want to checkpoint your work to rollback if you break it with further work, but preferably you'd want to save your work on the server.
One way to do this in SVN without an explicit shelve command is to switch your working copy to a different svn location and commit there instead of on your main repo. This is effectively like creating a temporary branch and working on that for the duration of your work. I don't think you'll even have to merge as SVN will do it for you when you switch, as your local modifications will be kept.
Unfortunately, you cannot switch to a non-existent location, so the first time you do this, you'll have to create the 'branch' to shelve to. I guess the whole thing could be automated.
Support Feature
SVN supports for shelves is experimental means, it doesn't promise backward compatibility for future releases, either its disabled by default.
it has been started with version 1.10
but the shelves create with 1.10 & 1.11 is not supported by newer version, as it didn't promises so.
so there are different underlying and you have to pay attention that this is an experimental feature and is going to be improved over the time.
the 1.10 shelve commands start with svn shelve but the 1.11 & 1.12 starts with svn x-shelve.
Commands
the commands for new shelve are:
svn x-shelf-diff
svn x-shelf-drop
svn x-shelf-list, x-shelves
svn x-shelf-list-by-paths
svn x-shelf-log
svn x-shelf-save
svn x-shelve
svn x-unshelve
Activating
for activating using this feature you have to run the command by setting the enviourment variable:
#Shelving-v3, as introduced in 1.12
SVN_EXPERIMENTAL_COMMANDS=shelf3
#Shelving-v2, as introduced in 1.11
SVN_EXPERIMENTAL_COMMANDS=shelf2
further information can be found here:
https://subversion.apache.org/docs/release-notes/1.14.html#shelving
