Two things that bzr makes hard :-(

[Robert Collins]

On Mon, 2008-06-02 at 16:46 +0100, Scott James Remnant wrote:
> I have two pretty common operations that bzr makes hard work, and
> kittens die in the process.
> 
> 
>  1) "What did they change?"
> 
> 	I work on the mainline of my project, other people make branches
> 	for various changes and ask me to review them.
> 
> 	I'll have trunk locally, and a URL of their branch.
> 
> 	There's no easy way to do this that doesn't have unexpected
> 	side-effects.
> 
> 
> 	$ bzr merge --preview

This is an interesting case. You can of course do 
$ bzr merge
$ bzr diff 
$ bzr revert
:)

merge --preview was created for submitters, not maintainers, so I think there is room to improve it.

>  2) "Roll back to revision X"
> 
> 	Sometimes I want to roll my branch and its checkout back to a
> 	particular revision.  The resulting branch and tree should be
> 	the same as if I'd checked it out with -r.
> 
> 	$ bzr revert -r 
> 
> 	Rolls the working tree back, but leaves the commits so the
> 	rollback appears as a great big diff.
> 
> 	$ bzr uncommit -r
> 
> 	Rolls the commits back, but leaves the working tree changes as a
> 	great big diff
> 
> 	I want both in one!

$ bzr update -r 
is the conceptual command.

bug https://bugs.edge.launchpad.net/bzr/+bug/45719 lists this.

-Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080604/1181887e/attachment-0001.pgp