[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: support for bzr shelve/unshelve in vc-dir
From: |
Óscar Fuentes |
Subject: |
Re: support for bzr shelve/unshelve in vc-dir |
Date: |
Fri, 04 Dec 2009 03:57:33 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (gnu/linux) |
Dan Nicolaescu <address@hidden> writes:
> "Stephen J. Turnbull" <address@hidden> 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
- Re: Splitting changes, (continued)
- Re: Splitting changes, Stefan Monnier, 2009/12/03
- Re: support for bzr shelve/unshelve in vc-dir, Óscar Fuentes, 2009/12/03
- Re: support for bzr shelve/unshelve in vc-dir, Óscar Fuentes, 2009/12/03
- Re: support for bzr shelve/unshelve in vc-dir, Dan Nicolaescu, 2009/12/03
- Re: support for bzr shelve/unshelve in vc-dir, Óscar Fuentes, 2009/12/03
- Re: support for bzr shelve/unshelve in vc-dir, Dan Nicolaescu, 2009/12/03
- Re: support for bzr shelve/unshelve in vc-dir, Óscar Fuentes, 2009/12/03
- Re: support for bzr shelve/unshelve in vc-dir, Dan Nicolaescu, 2009/12/03
- Re: support for bzr shelve/unshelve in vc-dir, Stephen J. Turnbull, 2009/12/03
- Re: support for bzr shelve/unshelve in vc-dir, Dan Nicolaescu, 2009/12/03
- Re: support for bzr shelve/unshelve in vc-dir,
Óscar Fuentes <=
- Re: support for bzr shelve/unshelve in vc-dir, Stephen J. Turnbull, 2009/12/04
- Re: support for bzr shelve/unshelve in vc-dir, Dan Nicolaescu, 2009/12/04
- Re: support for bzr shelve/unshelve in vc-dir, Óscar Fuentes, 2009/12/04
- Re: support for bzr shelve/unshelve in vc-dir, Dan Nicolaescu, 2009/12/04
- Re: support for bzr shelve/unshelve in vc-dir, Glenn Morris, 2009/12/04
- Re: support for bzr shelve/unshelve in vc-dir, Stephen J. Turnbull, 2009/12/04
- Re: support for bzr shelve/unshelve in vc-dir, Jan Djärv, 2009/12/05
- Re: support for bzr shelve/unshelve in vc-dir, Miles Bader, 2009/12/05
- Re: support for bzr shelve/unshelve in vc-dir, Stefan Monnier, 2009/12/05
- Re: support for bzr shelve/unshelve in vc-dir, Stephen J. Turnbull, 2009/12/05