Login | Register
My pages Projects Community openCollabNet

Discussions > dev [DISABLED] > Re: [PATCH] Fix for blame -g incorrect revisions

subversion
Discussion topic

Back to topic list

Re: [PATCH] Fix for blame -g incorrect revisions

Author alwood
Full name Alan Wood
Date 2009-04-24 15:17:56 PDT
Message Hi
 Been testing with Joel Jirak who was chasing this bug on the TortoiseSVN list..

Also, should be a fix for http://subversion.ti​gris.org/issues/show​_bug.cgi?id=3243
can someone confirm this on a Linux machine?

Alan

> Yes! This works perfectly. Awesome! Thanks for sticking with this one!
> Can we get this checked in?
>
> Joel Jirak

On 23 Apr 2009 at 21:08, dev at subversion dot tigris dot org wrote:

> Hi,
>
> Here is an updated version of the patch in which I have reverted two lines that I changed as I have been unable to convince myself that the change was necessary.
>
> Can't actually come up with a test case that uses the lines so I will leave them alone.
>
> Just trying to understand test system well enough to be able to add tests for this type of issue.
>
> Alan
>
> On 20 Apr 2009 at 21:33, Alan Wood wrote:
>
> > Hi All,
> > Here is a patch that hopefully corrects the output from blame -g in
> > the case where the merged data has an inserted line as the last line
> > in a chunk and some other cases I saw on the way. I have also
> > attached a bat file as a simpler example than the original post (
> > sorry it's windows ).
> >
> > I have tried this with 1.5.4 and 1.6.0
> > Also trunk with with existing wc format.
> >
> > Output from script
> > --------------------
> > C:\alan\subversion\test>svn --version
> > svn, version 1.6.0 (Release Candidate 3)
> > compiled Mar 15 2009, 12:54:57
> >
> > C:\alan\subversion\test>svn blame wc/trunk/a.txt
> > 1 Alan "line 1"
> > 1 Alan "line 2"
> > 6 Alan "line 2.1 branch rev 4"
> > 6 Alan "line 2.2 branch rev 5"
> > 1 Alan "line 3"
> > 3 Alan "line 3.1 trunk rev 3"
> > 3 Alan "line 3.2 trunk rev 3"
> > 1 Alan "line 4"
> > 3 Alan "line 4.1 trunk rev 3"
> >
> > C:\alan\subversion\test>svn blame -g wc/trunk/a.txt
> > 1 Alan "line 1"
> > 1 Alan "line 2"
> > G 4 Alan "line 2.1 branch rev 4"
> > 1 Alan "line 2.2 branch rev 5"
> > G 1 Alan "line 3"
> > 1 Alan "line 3.1 trunk rev 3"
> > 1 Alan "line 3.2 trunk rev 3"
> > G 1 Alan "line 4"
> > 1 Alan "line 4.1 trunk rev 3"
> >
> > -----------
> > after patch applied to trunk and running with the same working copy
> >
> > C:\alan\subversion​\test>svn.exe --version
> > svn, version 1.7.0 (dev build)
> > compiled Apr 20 2009, 17:20:24
> >
> > C:\alan\subversion​\test>svn.exe blame -g wc/trunk/a.txt
> > 1 Alan "line 1"
> > 1 Alan "line 2"
> > G 4 Alan "line 2.1 branch rev 4"
> > G 5 Alan "line 2.2 branch rev 5"
> > 1 Alan "line 3"
> > 3 Alan "line 3.1 trunk rev 3"
> > 3 Alan "line 3.2 trunk rev 3"
> > 1 Alan "line 4"
> > 3 Alan "line 4.1 trunk rev 3"
> >
> > refer to:
> > http://subversion.ti​gris.org/ds/viewMess​age.do?dsMessageId=1​179481&d
> > sForumId=462
> >
> > Possible log message:
> >
> > [[[
> > Fix issue with blame -g showing incorrect revisions when lines
> > added from branch
> > * subversion/svn/blame-cmd.c
> > (blame_receiver): Handle revision comparison when revision or
> > merged revision is not valid (xml output was already ok)
> >
> > * subversion/libsvn_cl​ient/blame.c
> > (normalize_blames): Split chunks correctly don't just extend the
> > later chunk back ( comments were correct but not code )
> > (svn_client_blame5): Allow information from merged line to be sent
> > to callback even when no valid revision pre-merge.
> > ]]]
> >
> >
> >
> > Alan Wood
> >
> > --------------------​--------------------​--------------
> > http://subversion.ti​gris.org/ds/viewMess​age.do?dsForumId=462​&dsMessageId=182​1874
>
>
>
> Attachments:
> C:\alan\subversion​\svn-trunk\blame2.​patch

« Previous message in topic | 12 of 15 | Next message in topic »

Messages

Show all messages in topic

[PATCH] Fix for blame -g incorrect revisions alwood Alan Wood 2009-04-20 02:33:25 PDT
     Re: [PATCH] Fix for blame -g incorrect revisions alwood Alan Wood 2009-04-23 02:11:41 PDT
         Re: [PATCH] Fix for blame -g incorrect revisions Lieven Govaerts <svnlgo at mobsol dot be> Lieven Govaerts <svnlgo at mobsol dot be> 2009-05-04 03:22:46 PDT
             Re: [PATCH] Fix for blame -g incorrect revisions alwood Alan Wood 2009-05-04 13:18:53 PDT
         Re: [PATCH] Fix for blame -g incorrect revisions Lieven Govaerts <svnlgo at mobsol dot be> Lieven Govaerts <svnlgo at mobsol dot be> 2009-05-13 10:34:52 PDT
             Re: [PATCH] Fix for blame -g incorrect revisions alwood Alan Wood 2009-05-13 15:04:09 PDT
                 Re: [PATCH] Fix for blame -g incorrect revisions Lieven Govaerts <svnlgo at mobsol dot be> Lieven Govaerts <svnlgo at mobsol dot be> 2009-05-13 23:19:58 PDT
                     Re: [PATCH] Fix for blame -g incorrect revisions alwood Alan Wood 2009-05-14 00:56:29 PDT
                     Re: [PATCH] Fix for blame -g incorrect revisions alwood Alan Wood 2009-05-14 01:50:24 PDT
                         Re: [PATCH] Fix for blame -g incorrect revisions gavinbaumanis Gavin Baumanis 2009-05-25 03:18:17 PDT
                             Re: [PATCH] Fix for blame -g incorrect revisions Lieven Govaerts <svnlgo at mobsol dot be> Lieven Govaerts <svnlgo at mobsol dot be> 2009-05-25 07:01:26 PDT
     Re: [PATCH] Fix for blame -g incorrect revisions alwood Alan Wood 2009-04-24 15:17:56 PDT
         Re: [PATCH] Fix for blame -g incorrect revisions gavinbaumanis Gavin Baumanis 2009-05-01 04:34:21 PDT
             RE: Re: [PATCH] Fix for blame -g incorrect revisions webpost at tigris dot org webpost at tigris dot org 2009-05-01 13:56:49 PDT
     RE: [PATCH] Fix for blame -g incorrect revisions webpost at tigris dot org webpost at tigris dot org 2009-04-27 03:21:56 PDT
Messages per page: