[BUG] when doing a bzr pull with conflicts

[Erik Bågfors]

2005/9/19, Robert Collins <robertc at robertcollins.net>:
> 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.

Which is what I thought, which is also why I didn't understand the discussion :)


> 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. :)

Ahh,, I agree on the two command thing, which is the part of the
discussion I was missing :)

Great

Regards,
Erik