[SVN-3625] Commit shelving

• Type: Improvement
• Status: Open
• Priority: Major
• Resolution: Unresolved
• Affects Version/s: trunk
• Fix Version/s: unscheduled, 1.12.0
• Component/s: libsvn_client
• Labels: api needsdesign
• Assignee: Unassigned
• Reporter: C. Michael Pilato
• Created: 05/May/10 18:42
• Updated: 07/Jan/20 15:47

Description

See the wiki pages: Shelving and Checkpointing

Developers often need to temporarily put aside in-process working copy changes to begin some other usually-short-lived task. You know the routine. You're halfway through the implementation of a medium-sized feature when – stop the presses! A customer just found a mission-critical bug in the app!

Current workarounds include:

• create a branch; switch to branch; commit unfinished primary task code to branch; switch back; handle and commit secondary task; merge from branch; resume primary task.

• use 'svn diff' to make a patchfile for primary task work; svn revert -R; handle and commit secondary task; use 'svn patch' to recreate local primary task mods; deal with all the stuff (copies and moves, directories, etc.) that 'patch' can't represent; resume primary task.

A better approach that avoids the need to create server branches and to marshal/unmarshal changes away from Subversion would be to support 'svn shelve/unshelve' commands, where "shelve" means "squirrel away my changes into the working copy metadata and revert them from the WORKING tree " and "unshelve" means "merge the changes I previously squirreled away back into my WORKING tree".

Issue Links

• is a parent of: SVN-4745 Shelving: diff & WC APIs
• is a parent of: SVN-4758 Shelving 1.10: Unable to shelve changes when using custom diff-cmd
• is blocked by: SVN-4774 Shelving: presence of old 1.10 shelves breaks shelf-list
• is blocked by: SVN-4776 Shelving: remove non-x-prefixed command aliases
• is blocked by: SVN-4709 shelve: deleted file becomes 'replaced'
• is duplicated by: SVN-2541 Introducing shelves
• is related to: SVN-2948 Add quilt-like capabilities to svn's changelist feature
• relates to: SVN-4772 Shelving: Command-line completion of shelf names
• relates to: SVN-3626 Commit checkpointing

Sub-Tasks

• Shelving: from experimental to supported: Open
• Shelving: JavaHL bindings: Open
• Shelving: SWIG bindings: Open
• Shelving: refactor so checkpoints are built from a series of simple shelves: Open
• Shelving: Integrate with Changelists: Open
• Shelving: CLI syntax for accessing a shelf: Open
• Shelving: command-line output format of svn shelves / shelf-list: Open
• Shelving: remind user if old 1.10 shelves exist: Open
• Shelving: roll-back should not destroy newer versions by default: Open