[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [RFC] Shelving and Checkpointing

From: Mark Phippard <markphip_at_gmail.com>
Date: Wed, 12 Jul 2017 10:23:44 -0400

On Wed, Jul 12, 2017 at 4:18 AM, Julian Foad <julianfoad_at_apache.org> wrote:

> I committed an initial prototype for shelving on the "shelve-checkpoint"
> branch.
>
> Here is the help output:
> [[[
> $ svn shelve --help
> shelve: Shelve changes.
> usage: 1. shelve NAME PATH...
> 2. shelve --delete NAME
> 3. shelve --list
>
> 1. Shelve as NAME the local changes in the given PATHs.
> 2. Delete the shelved patch NAME.
> 3. List shelved patches.
> [...]
>
> $ svn unshelve --help
> unshelve: Unshelve changes.
> usage: unshelve [--keep] NAME
>
> ]]]
>
> Here is an example session:
> [[[
> $ # create and commit some files
>
> $ mkdir doc; echo hello > doc/hello.txt; echo config > config
>
> $ svn add --force .; svn ci -q -m ""
> A config
> A doc
> A doc/hello.txt
>
> $ # start making some changes to docs
>
> $ echo new > doc/new.txt; svn add doc/new.txt
> A doc/new.txt
>
> $ echo more >> config
>
> $ svn st
> M config
> A doc/new.txt
>
> $ # shelve these documentation changes
>
> $ svn shelve docs .
> U config
> D doc/new.txt
> shelved 'docs'
>
> $ svn st
>
> $ svn shelve --list
> docs.patch
>
> $ # work on a quick fix and commit it
>
> $ echo Hello > doc/hello.txt
>
> $ svn ci -q -m "Fix capitalization."
>
> $ # unshelve to continue work on docs
>
> $ svn unshelve docs
> U config
> A doc/new.txt
> unshelved 'docs'
>
> $ svn st
> M config
> A doc/new.txt
>
> $ svn shelve --list
>
> ]]]
>
> If you have a chance to try it yourself, I'd love to hear your first
> impressions.
>
>
>

Nice to see you have gotten this far.

I am not even sure how this behaves with git stash but what happens if the
patch cannot be applied cleanly? Is the path to "fixing things" relatively
clear? Like does patch just create conflicts that you resolve like
anything else?

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
Received on 2017-07-12 16:24:03 CEST

This is an archived mail posted to the Subversion Dev mailing list.