Re: How to review a remote bzr branch

sön 2010-05-23 klockan 16:30 -0600 skrev Alex Rousskov:

> > bzr diff -r ancestor:. --new lp:~yadi/squid/cleanup-comm
>
> I used this trick for the review. For the record, the diff includes
> reversal of recent trunk changes but it is probably possible to avoid
> that if the last branch merging point is known.

Right.. ancestor needs to point to the other branch for diff to work.

bzr diff -r ancestor:lp:~yadi/squid/cleanup-comm --new lp:~yadi/squid/cleanup-comm

seems to produce the right result, equal to bzr send.

a bit confusing command this..

> Noted. The merge command may produce conflicts that will not be
> immediately visible in bzr diff, right?

Yes, as it first tries to apply the changes to the current tree, instead
of diffing at a past time like the right diff command or bzr send.

Regards
Henrik
Received on Mon May 24 2010 - 06:46:37 MDT