bzrtools: 'bzr annotate' fails

Michael Ellerman michael at
Fri Sep 23 05:38:53 BST 2005

On Fri, 23 Sep 2005 13:19, Aaron Bentley wrote:
> Michael Ellerman wrote:
> > On Fri, 23 Sep 2005 12:35, Martin Pool wrote:
> >>On 23/09/05, John Arbash Meinel <john at> wrote:
> >>>$ bzr annotate
> >>>bzr: ERROR: Malformed patch header.  No orig line
> >>>''
> >>
> >>This might be caused by robert changing the diff prefix from *** to
> >>=== for compatability with patchutils.
> >
> > I imagine so. That broke shelve as well.
> I fixed the problem in shelve, so this probably isn't quite the same
> thing.  It looks like a blank leading line, or possibly not having a
> patch at all.

I'm still running my version of shelve, so that was what broke *it*. But if 
you're still seeing something with a fixed version then I guess there's 
something else going on.

It strikes me that there's going to be a few places in bzr where we'll want to 
be able to parse diffs into hunks and do smart things with them, so we should 
really work on getting a common implementation of that happening in bzrlib.


Michael Ellerman
IBM OzLabs

phone: +61 2 6212 1183 (tie line 70 21183)

We do not inherit the earth from our ancestors,
we borrow it from our children. - S.M.A.R.T Person
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : 

More information about the bazaar mailing list