<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> </head> <body text="#000000" bgcolor="#ffffff"> 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: <ul> <li>All the changes that happened in "grand-child", excluding the merges from "child".</li> <li>All the changes that happened in "child" and are present in "grand-child", excluding revisions that haven't been merged into "grand-child".</li> </ul> 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: <ul> <li>All the changes that happened in "grand-child", excluding the merges from "child" and "child2".</li> <li>All the changes that happened in "child" and "child2", and have been merged into "grand-child".</li> </ul> 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. <pre class="moz-signature" cols="72">-- Gustavo Narea. Software Developer. 2degrees, Ltd. <a class="moz-txt-link-rfc2396E" href="http://dev.2degreesnetwork.com/"><http://dev.2degreesnetwork.com/></a>.</pre> </body> </html>