How to get diff for local revisions and parent revisions?

[Gustavo Narea]

Hello, everyone.

I'm working on the Bazaar integration for Review Board and I need a way
to get one diff with all the changes that happened in the local branch,
and one diff that included both the changes in its parent(s) with
respect to trunk and all the merges.

So, for example, "trunk" is the mainline development branch and it has
one branch, called "child". "child" has revisions that haven't been
merged into "trunk". Then a branch of "child" is created and it's called
"grand-child", and more revisions are added to "grand-child". Later,
some new revisions in "child" are merged into "grand-child". In this
situation, I'd like to get two diffs:

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

Now, I also have to consider what would happen if "trunk" had another
descendant called "child2" and it's merged into "grand-child". In that
case, the two diffs should be:

    * 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".

Put simply, I need to separate the changes that happened in a branch
from the changes they depend on with respect to trunk.

How can I do this?

Thanks in advance.

-- 
Gustavo Narea.
Software Developer.
2degrees, Ltd. <http://dev.2degreesnetwork.com/>.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20100916/894f114e/attachment.htm