[PATCH] indent merges more nicely during merge

[Erik Bågfors]

> >
> > > ------------------------------------------------------------
> > > revno: 1591
> > > committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
> > > branch nick: +trunk
> > > timestamp: Mon 2006-03-20 10:33:11 +0000
> > > message:
> > >   (mbp) pycurl bugfixes, robert's knit performance stuff
> > >     ------------------------------------------------------------
> > >     merged: mbp at sourcefrog.net-20060320095825-ed99032ef9743cc8
> > >     committer: Martin Pool <mbp at sourcefrog.net>
> > >     branch nick: bzr.mbp.integration
> > >     timestamp: Mon 2006-03-20 09:58:25 +0000
> > >     message:
> > >       [merge] robert's knit-performance work
> >
> > I think we could omit the merged revision-id here; the indenting makes
> > it clear that it was merged.
>
> I think we should show some identifier though... perhaps the revno on
> that branch ?

I think it's useful to show something that can be used.  In the merged
case, it's revid (AFAIK), not the revid of the other branch.  Use can
use it in diff for example.  However, it's clear that it's merged, so
can't we name it "revid" instead of merged?

revno: 1611
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-04-04 02:48:51 +0100
message:
  Merge Erik Bagfors --trees option for init-repository.
    ------------------------------------------------------------
    revid: robertc at robertcollins.net-20060404002828-7ae872815166a0e2
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Tue 2006-04-04 10:28:28 +1000
    message:
      Merge Erik Bågfors --trees option for init-repository.

And one could use "bzr diff -r
revid:robertc at robertcollins.net-20060404002828-7ae872815166a0e2..revno:1611"

That feels quite clear

/Erik