How to get diff for local revisions and parent revisions?

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 09/16/2010 07:43 AM, Marius Kruger wrote:
> 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

The difftacular plugin can do the first one:
https://launchpad.net/difftacular

$ cd grand-child
$ bzr diff-ignore-branches -r ancestor:parent.. child child2

It can't do the second, but contributions are welcome.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkzHHPwACgkQ0F+nu1YWqI31ogCffOYzRkcW5XupXChtMMsOdeXZ
zLEAnRQyMcc5H8Nx5QPn/yfyoe8eJzQs
=QtG3
-----END PGP SIGNATURE-----