RE: [viewvc-dev] Issue with annotation

I've just did a svn update and reinstalled viewvc and it works just fine. 

Thanks a lot.

Manu

> -----Original Message-----
> From: C. Michael Pilato [mailto:[email protected]]
> Sent: Friday, May 02, 2014 08:04
> To: [email protected]; [email protected]
> Subject: Re: [viewvc-dev] Issue with annotation
> 
> On 05/02/2014 09:44 AM, C. Michael Pilato wrote:
> > On 05/01/2014 04:06 PM, Emmanuel Stapf wrote:
> >> Hi,
> >>
> >> I had an issue with annotation which would not show up because of the
> >> following
> >> error:
> >>
> >> Error occurred while calculating annotation data.
> >>
> >> I pinpointed the problem to the following line #1819 in lib/viewvc.py:
> >>
> >>   if blame_data and (len(file_lines) != len(blame_data)):
> >
> > Manu,
> >
> > Thanks so much for the report.  Sorry for what appears like a
> > regression in ViewVC's functionality.
> >
> > In looking at the file you pointed me to (thanks!), it looks like
> > there's just a bunch of empty lines at the end of the file that are
> > getting dropped.  I'm comparing the "annotate" view and the "markup"
> > view of that 'ev_dialog_i.e' file -- the "markup" view lacks the
> > trailing blank lines.  Does that seem to always be the case when this
> > error has cropped up for you?
> >
> > I checked out a copy of your source at the revision you pointed me to,
> > and the blank lines are certainly present there at the end of the file.
> >  I was able even to replicate the history of the file into a local
> > repository so I can more easily diagnose the problem.  I'll let you
> > know what I find, hoping that this one file is exemplary of the
> > problems seen elsewhere in your data set.
> 
> Found it!  Seems I was a bit sloppy with some string manipulation.  If
> you are able to test out the attached patch (with your tweaks removed),
> that would be great.  (I've committed these changes to ViewVC's trunk and
> 1.1.x branches.)
> 
> --
> C. Michael Pilato <[email protected]>
> CollabNet   <>   www.collab.net   <>   Enterprise Cloud Development

------------------------------------------------------
http://viewvc.tigris.org/ds/viewMessage.do?dsForumId=4251&dsMessageId=3077416

To unsubscribe from this discussion, e-mail: [[email protected]].