[BUG] when doing a bzr pull with conflicts

[Robert Collins]

On Mon, 2005-09-19 at 10:54 +0200, Erik Bågfors wrote:
..
> I want to see a mix of this.
> I'd like to see
..
> bzr diff -r revid:B2..revid:B3
> to be able to find out what jblack did there.  Even if I get it from
> your branch.
> 
> Don't know if this is doable, but it would be great I think.

Completely doable - its exactly what we're aiming at.

That said - there is still room for the $append_history thing where my
commit doesn't show up at all - i.e. within just your own branches, or
people who (like Aaron says) are mirroring, or folk working on a shared
branch. Which is why we need two commands. :)

Rob

-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050919/b773b012/attachment.pgp