[Extension] Dirty hack of 'shelve' and 'unshelve' command
Martin Pool
mbp at sourcefrog.net
Thu May 19 09:02:32 BST 2005
On 19 May 2005, Michael Ellerman <michael at ellerman.id.au> wrote:
> Hi All,
>
> I'm a big nut fan of Darc's support for partial commits. If you've never used
> it, it allows you to choose which hunks of the diff you want to commit - how
> awesome.
>
> However it has one drawback, which is that it allows you to commit to history
> tree states that never actually existed in your working tree/repository.
> Usually that's exactly why you use it, but it can lead to embarassing errors,
> like if you forget to check in a new file but *do* check in the change to the
> Makefile that references it.
http://article.gmane.org/gmane.comp.version-control.bazaar-ng.general/734
> So I thought I'd try a different interface to solve basically the same
> problem. And so we have the 'shelve' and 'unshelve' commands.
>
> I know the names a bit dicky, I thought of 'postpone' and 'reinstate' or
> something, but 'shelve' and 'unshelve' are at least obviously symetrical.
>
> Basically you can run 'bzr shelve' and it will prompt you which hunks you want
> to 'place on the shelf', ie. put away for the moment. You can then make sure
> your tree still builds, run any tests, and then use the regular 'bzr commit'.
That sounds interesting; this is like tla's undo/redo commands, except
that they don't let you choose hunks (and are prone to break when you
need them most.)
--
Martin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050519/5802a91c/attachment.pgp
More information about the bazaar
mailing list