[rfc] creating clean diffs

[John Arbash Meinel]

Lately, I've been doing some dev work, where I do some work and post it
to the list. Before it is accepted, I start doing a little bit more
work. In the process, bzr.dev is updated with something else, that I
want to get locally.

So I merge bzr.dev, and then I continue working.

So at this point, I want to create a nice looking diff, so that people
can review just my new changes (as an add on to the previous changes).

I don't want to include the merge from bzr.dev, so just doing '-r
last_post_revno' won't work. But also I can't do 'bzr diff -r
ancestor:bzr.dev' because that would include my earlier work.

The only way I've seen around it is to create another branch with
something like:

bzr branch -r last_post_revno . ../temp
cd ../temp
bzr merge ../bzr.dev
bzr commit

cd ..
bzr diff temp working

(or cd ../working, bzr diff -r branch:../temp)


This seems to work, though if there were any conflicts in the previous
merge, they have to be resolved again in the temp merge.

Is it possible for us to do any better? I'm not sure that we can, but it
seems like it is kind of a 3-way diff. Where I want 'this' to be the
current tree, 'other' to be my previously posted tree, and 'base' to be
the last bzr.dev.

Anyway, just something I wanted to see if anyone had any ideas on how to
solve.

John
=:->

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 254 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060703/7f388d6b/attachment.pgp