[jira] [Comment Edited] (SVN-3625) Commit shelving

["Julian Foad (JIRA)" <ji...@apache.org>]

    [ https://issues.apache.org/jira/browse/SVN-3625?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16083682#comment-16083682 ] 

Julian Foad edited comment on SVN-3625 at 6/22/18 1:52 PM:
-----------------------------------------------------------

I am working on Shelving and Checkpointing.

* discussing in dev@ threads, initially "[\[RFC\] Shelving and Checkpointing|https://lists.apache.org/thread.html/4fe683f50f4528e3b6e4a66ceffedc673622e82a5f3587083c77384a@%3Cdev.subversion.apache.org%3E]"
* designing in the document "[Shelving-Checkpointing Dev|https://cwiki.apache.org/confluence/x/h5jLB]"
* prototyping in the "[shelve|http://svn.apache.org/repos/asf/subversion/branches/shelve/]" branch



was (Author: julianfoad):
I am working on Shelving and Checkpointing.

* discussing in dev@ threads, initially "[\[RFC\] Shelving and Checkpointing|https://lists.apache.org/thread.html/4fe683f50f4528e3b6e4a66ceffedc673622e82a5f3587083c77384a@%3Cdev.subversion.apache.org%3E]"
* designing in the document "[Shelving-Checkpointing Dev|https://docs.google.com/document/d/1PVgw0BdPF7v67oxIK7B_Yjmr3p28ojabP5N1PfZTsHk/]"
* prototyping in the "[shelve|http://svn.apache.org/repos/asf/subversion/branches/shelve/]" branch


> Commit shelving
> ---------------
>
>                 Key: SVN-3625
>                 URL: https://issues.apache.org/jira/browse/SVN-3625
>             Project: Subversion
>          Issue Type: Improvement
>          Components: libsvn_client
>    Affects Versions: trunk
>            Reporter: C. Michael Pilato
>            Assignee: Julian Foad
>            Priority: Major
>              Labels: api, needsdesign
>             Fix For: 1.10.0
>
>
> (i) See the wiki pages: [Shelving and Checkpointing|https://cwiki.apache.org/confluence/display/SVN/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 'patch' to recreate local primary task mods; deal with all the stuff (prop changes, added/deleted files, etc.) that 'patch' can't represent; resume primary task.
>  * (same as above, except that in 1.7 you can use 'svn patch' instead of 'patch' and the fixup step)
> 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".



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)