Re: Annotate another problem report
- From
- Ryan Anderson <ryan@michonline.com>
- Date
- Aug 7, 2006, 20:19 UTC
- Message-ID
- <20060807201920.GE15477@h4x0r5.com>
- In-Reply-To
- <7vpsfc1fkt.fsf_-_@assigned-by-dhcp.cox.net>
On Mon, Aug 07, 2006 at 01:00:34PM -0700, Junio C Hamano wrote:
> "git annotate Makefile v1.4.0" outputs this:
Known. I think this is related to the merge-parsing bug.
Unfortunately, the only test cases I've found for this involve things with both a lot of revisions and a lot of lines, so it's a bit hard to manually see what's going wrong.
Show 19 quoted lines
> ... > 58e60dd2 (Nick Hengeveld 2005-11-02 11:19:24 -0800 13)# git....... > 58e60dd2 (Nick Hengeveld 2005-11-02 11:19:24 -0800 14)# tra....... > ( 1970-01-01 00:00:00 15)# > 6d9bbc50 (Patrick Mauritz 2005-09-19 16:11:19 +0200 16)# .. > 6d9bbc50 (Patrick Mauritz 2005-09-19 16:11:19 +0200 17)# .. > ... > > There are a handful lines it couldn't tell where they came from: > > ( 1970-01-01 00:00:00 15)# > ( 1970-01-01 00:00:00 179) > ( 1970-01-01 00:00:00 182) > ( 1970-01-01 00:00:00 274)endif > ( 1970-01-01 00:00:00 323) > ( 1970-01-01 00:00:00 384)else > ( 1970-01-01 00:00:00 385) LIB_4_ICONV = > >
-- Ryan Anderson sometimes Pug Majere