Introducing Shelf 2

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Martin Pool wrote:
> On Thu, Oct 9, 2008 at 6:11 PM, Alexander Belchenko <bialix at ukr.net> wrote:
>> Aaron Bentley пишет:
>>> Hi all,
>>>
>>> Most Bazaar users seem to love the 'shelf' command.  I think it's
>>> fantastically useful, and that's not vanity because the primary author
>>> was Michael Ellerman.
>>>
>>> Nice as it is, shelf has limitations because it's based on applying
>>> patches.  It can't shelve renames.  It can shelve added files, but won't
>>> restore their file ids when you unshelve.  Basically, it's not as close
>>> to revert as it ought to be, which leaves users having to decide whether
>>> they need shelf or revert.
> 
> This sounds pretty cool.  I'd like to see it merged in, because it's
> something many users may want, and because that'll make it easier for
> GUIs to build on it.

I'm happy with that.  Shelf 2 has a dependency on /usr/bin/patch.  This
is because shelf 2 requires inexact patching (it edits diff hunks
without updating their positions).  Bazaar supports only exact patching.

Should we:
 - make bzr depend on patch?
 - implement inexact patch ourselves?
 - teach shelf to update the hunk positions so we can do exact patching?
 - change the UI to not use unified diffs?

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkjvuRoACgkQ0F+nu1YWqI1V3gCdEscEzkx3XmRuDoLq+MlLr8uZ
WvgAnAr9z1bDcYs5EApfu5Qxjg7yDg6t
=uPgk
-----END PGP SIGNATURE-----