Two things that bzr makes hard :-(

[Scott James Remnant]

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

	Has side effects, like setting the submit branch!  Trunk should
	not have a submit branch!  (Also can't use meld :p)


	$ bzr diff --new

	Shows any changes made on the trunk since they branched :-(


	$ bzr diff -r ancestor:.

	Does the right thing, but is annoyingly wordy.


 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!

Scott
-- 
Have you ever, ever felt like this?
Had strange things happen?  Are you going round the twist?
-------------- 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/20080602/8604a880/attachment.pgp