subversion-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Daniel Shahaf <danie...@apache.org>
Subject Re: [RFC] Shelving and Checkpointing
Date Tue, 11 Jul 2017 20:08:57 GMT
On Mon, Jul 10, 2017 at 02:03:41PM +0100, Julian Foad wrote:
> Checkpointing
> 
> Options:
> 
> 
>    1.
> 
>    further patch management built on a series of shelved changes
>    2.
> 
>    local commits tightly integrated
>    3.
> 
>    checkpoints are commits in a local repository

Can you explain these three options in more words?  AIUI #1 is
"syntactic sugar to manage a patch series", like quilt(1), but I'm not
sure I understand #2 and #3.

> SHELVING
> 
> git stashing <https://git-scm.com/book/en/v1/Git-Tools-Stashing>
> 

For git, 'stashing' can also be implemented by a temporary branch («git
checkout -b foo && git commit -amm && git checkout master»), which
changes some of the values of the table.  I assume the same is true for hg.

> hg shelving <https://www.selenic.com/mercurial/hg.1.html#shelve>
> 
> bzr shelving
> <http://doc.bazaar.canonical.com/bzr.dev/en/user-guide/shelving_changes.html>
> 
> p4 shelving
> <https://www.perforce.com/perforce/r17.1/manuals/p4guide/chapter.basic-tasks.html#basic-tasks.recurring-other.changelist.shelve>
> 
> IntelliJ
> <https://www.jetbrains.com/help/idea/shelving-and-unshelving-changes.html>
> 
> NetBeans
> <http://docs.oracle.com/netbeans/nb82/netbeans/netbeans/NBDAG/version_control.htm#NBDAG2545>

Unfortunately the text/plain rendering of that table is quite lossy.
The part I quoted are the column headings; the row headings are
"general" "stored where?" "stored how?" "changelist integration" "pop
vs. apply" "access in other cmds" "merge & conflicts".

Cheers,

Daniel


Mime
View raw message