Is there a way to delete something that has been shelved?

3

TortoiseSVN has the option to shelve/unshelve changes. I couldn't find a way to delete something that was shelved. The workaround I use is unshelve on a clean working copy and then reverting.

Mario Marinato

Posted 2018-09-27T14:46:02.233

Reputation: 966

Answers

2

This might not be an answer, but I think you will have to wait for TortoiseSVN to reach SVN version 1.11, and until then to continue to use your workaround.

New in version 1.11 is the command x-shelf-drop (shelf-drop) to delete a shelf, as listed in the Apache article of Shelving in Svn-trunk.

Current TortoiseSVN version is described as:

The current version 1.10.1 is linked against the Subversion library 1.10.2.

harrymc

Posted 2018-09-27T14:46:02.233

Reputation: 306 093

This is still not resolved in TortoiseSVN 1.12, which is linked to SVN 1.12.0. The answer by @Grilse is the only way to delete shelves at the moment. – HappyDog – 2019-07-17T11:41:55.327

7

TortoiseSVN's Unshelve does not delete (drop) the shelf for me, regardless of whether the unshelving yields conflicts or not. (I'm using TortoiseSVN 1.11.1, Build 28492)

Workaround: delete/drop the shelf using SVN directly, rather than via TortoiseSVN. In a console:

$ svn help x-shelf-drop
x-shelf-drop: Delete a shelf.
usage: x-shelf-drop SHELF [PATH ...]

  Delete the shelves named SHELF from the working copies containing PATH
  (default PATH is '.')

…

$ svn x-shelf-drop "Name of shelf"
deleted 'Name of shelf'

Docs: https://cwiki.apache.org/confluence/display/SVN/Shelving+in+Svn-trunk

Grilse

Posted 2018-09-27T14:46:02.233

Reputation: 1 196

And to use the command line when you have TortoiseSVN, re-run the setup and add "command line client tools" – Peet Brits – 2019-05-22T07:00:17.407

This is still the case in TortoiseSVN 1.12.0. – HappyDog – 2019-07-17T11:42:33.897