From: "Óscar Fuentes" <ofv@wanadoo.es>
To: emacs-devel@gnu.org
Cc: Dan Nicolaescu <dann@ics.uci.edu>
Subject: Re: support for bzr shelve/unshelve in vc-dir
Date: Fri, 04 Dec 2009 03:57:33 +0100 [thread overview]
Message-ID: <87hbs7zbs2.fsf@telefonica.net> (raw)
In-Reply-To: 200912040147.nB41ldTH000836@godzilla.ics.uci.edu
Dan Nicolaescu <dann@ics.uci.edu> writes:
> "Stephen J. Turnbull" <stephen@xemacs.org> writes:
>
> > Dan Nicolaescu writes:
> >
> > > I know nothing about bzr, but unshelve --keep is gotta be trivial to
> > > implement...
> >
> > It's not, because the shelf is kept in the history. Unshelving needs
> > to rewind the history so that tip points to the pre-shelve revision.
> > bzr has no refs, so recovering the shelved revision after an unshelve
> > is non-trivial. It may not be hard, either, except that for it to be
> > reliable may require the bzr developers to make promises about internal
> > storage management.
>
> A several months old bzr tree happens to be my playground for testing
> VC changes on bzr.
> I changed "delete_shelf" to always be True in bzrlib/shelf_ui.py, and
> now "bzr unshelve --apply" does not remove shelves, and they seem to be
> valid and can be applied multiple times.
Exactly my findings.
As unshelve essentially does a merge, I do not understand why what
Stephen explains is relevant here. Furthermore, Bazaar allows having
multiple shelves and unshelving them out-of-order. But I'm not an expert
on this area either and possibly I'm missing something.
BTW, coding the feature is trivial. Getting it into Bazaar is the
difficult part. They have a slow, very stringent process for
incorporating changes. They require to sign copyright papers too,
something I did for Emacs but wont do for a private business.
--
Óscar
next prev parent reply other threads:[~2009-12-04 2:57 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
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 [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87hbs7zbs2.fsf@telefonica.net \
--to=ofv@wanadoo.es \
--cc=dann@ics.uci.edu \
--cc=emacs-devel@gnu.org \
/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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.