From: Stefan Monnier <monnier@IRO.UMontreal.CA>
To: "Óscar Fuentes" <ofv@wanadoo.es>
Cc: emacs-devel@gnu.org
Subject: Re: Splitting changes
Date: Thu, 03 Dec 2009 15:50:12 -0500 [thread overview]
Message-ID: <jwvy6lj6b11.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <874oo72622.fsf@telefonica.net> ("Óscar Fuentes"'s message of "Thu, 03 Dec 2009 20:47:33 +0100")
>> So the way my hack works is the following:
>> - it takes ("stashes") a copy of the current state.
>> - then it lets you make any changes you want (the intention is that
>> you're going to revert the changes you want to keep for later).
>> You can do this part at any granularity: files, hunks, or even
>> by hand.
>> - when done, you commit, after which the saved files are re-instated.
> This can be achieved with the feature Dan is requesting for Bazaar (and
> git already has):
>> > 2. something similar to "git stash apply", i.e. apply the shelf but do
>> > not remove it. This makes it easy to split changes for example.
> With that feature you would do
> bzr shelve --all
> bzr unshelve --keep # that option would prevent removing the shelve
> <hack, hack, hack>
> bzr commit etc
> bzr unshelve
Yes, that sounds about right. IIUC "bzr unshelve --keep" is what Dan
calls "bzr apply". So the fundamental backend operations that are
needed are shelve/stash (with a vc-fileset), unshelve-keep/apply, and
unshelve. We could even provide a default implementation that "shelves"
by storing a patch, and unshelves by apply that patch, for those
backends that don't support anything similar.
Stefan
next prev parent reply other threads:[~2009-12-03 20:50 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-01 19:47 support for bzr shelve/unshelve in vc-dir Dan Nicolaescu
2009-12-01 20:48 ` Xavier Maillard
2009-12-02 5:43 ` Dan Nicolaescu
2009-12-02 6:37 ` Óscar Fuentes
2009-12-01 22:11 ` Stefan Monnier
2009-12-01 22:50 ` Óscar Fuentes
2009-12-01 23:18 ` Óscar Fuentes
2009-12-02 3:00 ` Dan Nicolaescu
2009-12-02 3:03 ` Dan Nicolaescu
2009-12-02 3:31 ` Óscar Fuentes
2009-12-02 4:35 ` Stefan Monnier
2009-12-02 5:06 ` Óscar Fuentes
2009-12-02 6:16 ` Stephen J. Turnbull
2009-12-02 6:42 ` Óscar Fuentes
2009-12-03 7:48 ` Dan Nicolaescu
2009-12-03 8:25 ` Óscar Fuentes
2009-12-03 8:32 ` Bojan Nikolic
2009-12-03 9:07 ` Dan Nicolaescu
2009-12-03 17:05 ` Splitting changes (was: support for bzr shelve/unshelve in vc-dir) Stefan Monnier
2009-12-03 17:46 ` Eli Zaretskii
2009-12-03 19:26 ` Splitting changes Stefan Monnier
2009-12-03 19:47 ` Óscar Fuentes
2009-12-03 20:50 ` Stefan Monnier [this message]
2009-12-03 17:24 ` support for bzr shelve/unshelve in vc-dir Óscar Fuentes
2009-12-03 18:18 ` Óscar Fuentes
2009-12-03 18:48 ` Dan Nicolaescu
2009-12-03 19:00 ` Óscar Fuentes
2009-12-03 19:17 ` Dan Nicolaescu
2009-12-03 21:30 ` Óscar Fuentes
2009-12-03 22:57 ` Dan Nicolaescu
2009-12-04 0:42 ` Stephen J. Turnbull
2009-12-04 1:47 ` Dan Nicolaescu
2009-12-04 2:57 ` Óscar Fuentes
2009-12-04 6:36 ` Stephen J. Turnbull
2009-12-04 21:18 ` Dan Nicolaescu
2009-12-04 21:59 ` Óscar Fuentes
2009-12-04 22:57 ` Dan Nicolaescu
2009-12-04 23:52 ` Glenn Morris
2009-12-05 3:57 ` Stephen J. Turnbull
2009-12-05 6:49 ` Jan Djärv
2009-12-05 7:12 ` Miles Bader
2009-12-05 16:12 ` Stefan Monnier
2009-12-05 12:09 ` Stephen J. Turnbull
2009-12-05 19:59 ` Glenn Morris
2009-12-06 19:27 ` Richard Stallman
2009-12-06 20:11 ` GNU bzr [was Re: support for bzr shelve/unshelve in vc-dir] Glenn Morris
2009-12-09 13:20 ` Richard Stallman
2009-12-09 16:50 ` GNU bzr Karl Fogel
2009-12-15 23:11 ` Karl Fogel
2009-12-10 0:16 ` support for bzr shelve/unshelve in vc-dir Martin Pool
2009-12-10 3:46 ` Stefan Monnier
2009-12-10 4:19 ` Martin Pool
2009-12-10 14:02 ` Dan Nicolaescu
2009-12-11 4:02 ` Martin Pool
2009-12-18 15:39 ` Dan Nicolaescu
2009-12-21 1:49 ` Martin Pool
2009-12-11 5:53 ` Martin Pool
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwvy6lj6b11.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=emacs-devel@gnu.org \
--cc=ofv@wanadoo.es \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).