Some questions on internals

Martin Pool mbp at canonical.com
Fri Feb 19 03:24:31 GMT 2010


On 19 February 2010 13:25, Frits Jalvingh <jal at etc.to> wrote:
> Hello list,
>
> I am investigating to build a code review system that works with bazaar
> with some special characteristics. The most important one is that it has
> to be able to track a single merge before it merges into /several/
> master branches; each master branch represents a "version" of a product.

OK, that sounds interesting.

> 1. It is important to track renames. Is it possible to get the diff
> command to output the file ID of the files it shows in the output? This
> would allow me to easily find a renamed file in another branch. If not-
> is there a way to translate file id -> filename and vice versa?

There is no option at the moment but it would be easy to add.
Alternatively you could match up the diff output with eg status
--show-ids.

>
> 2. I am afraid the answer is no- but.... Is there any way to relate the
> chunks of the delta caused in 3.2 with the related chunks in the delta
> to 3.1 (the initial fix merge)? Especially considering the possibility
> that merge conflicts on 3.2 would cause (small) changes in the merge
> there?

Well, you could for instance commit the merge to a temporary branch,
then merge that, then annotate the result and pick out the bits.

-- 
Martin <http://launchpad.net/~mbp/>



More information about the bazaar mailing list