[Extension] Dirty hack of 'shelve' and 'unshelve' command
Magnus Therning
magnus at therning.org
Thu May 19 22:09:04 BST 2005
On Thu, May 19, 2005 at 10:44:08AM -0400, Aaron Bentley wrote:
>-----BEGIN PGP SIGNED MESSAGE-----
>Hash: SHA1
>
>Erik Bågfors wrote:
>| I think this is very useful. But I'd love to also see a "bzr commit
>| --interactive" or something like that, that would let the user select
>| the hunks he likes to commit.
>
>This idea really bothers me, and has since I heard about per-hunk
>commit in Darcs. Committing selected hunks that may make no sense out
>of context, with no opportunity for review, and only one chance to get
>it right? How is that better than typing one extra command?
>
>People clearly want this, even though from where I stand, it looks like
>they're on crack. So what am I missing?
Is it geared to solving something that happens on the Linux kernel
mailing list (seemngly) regularly--people having to split up their
changes into smaller pieces?
Would the following make sense?
$ bzr branch --base my.dev at -1 # branch off second to last revision
$ bzr merge my.dev # bring in changes in last revision
$ bzr shelve --all # basically the same as undo?
$ bzr unshelve # bring in some of the changes
$ bzr commit --message 'Change 1'
$ bzr unshelve # bring some more changes
$ bzr commit --message 'Change 2'
... repeat ad nauseum ...
/M
--
Magnus Therning (OpenPGP: 0xAB4DFBA4)
magnus at therning.org
http://magnus.therning.org/
Software is not manufactured, it is something you write and publish.
Keep Europe free from software patents, we do not want censorship
by patent law on written works.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050519/829a19f8/attachment.pgp
More information about the bazaar
mailing list