How to get diff for local revisions and parent revisions?

[Marius Kruger]

On 16 September 2010 13:19, Gustavo Narea
<gnarea at tech.2degreesnetwork.com> wrote:
> All the changes that happened in "grand-child", excluding the merges from
> "child".

grand-child$ bzr diff -r ancestor:child..

> All the changes that happened in "child" and are present in "grand-child",
> excluding revisions that haven't been merged into "grand-child".

grand-child$ bzr diff -r ancestor:child..
(maybe I don't understand correctly)

> All the changes that happened in "grand-child", excluding the merges from
> "child" and "child2".
> All the changes that happened in "child" and "child2", and have been merged
> into "grand-child".


I don't think we can do these in one go. Maybe it will be possible in a plugin.
doing this threeway diff sounds tricky
I think it may be easier to always have two branches you want to compare
eg. in the above you need to first merge child and child2 into a child1and2
before you can diff that with grandchild.
(maybe there is some trick I don't know of)