Login | Register
My pages Projects Community openCollabNet

Discussions > dev [DISABLED] > Re: svn commit: r37723 - in trunk/subversion: libsvn_client tests/cmdline

subversion
Discussion topic

Back to topic list

Re: svn commit: r37723 - in trunk/subversion: libsvn_client tests/cmdline

Author hwright
Full name Hyrum K. Wright
Date 2009-05-14 05:16:15 PDT
Message On May 14, 2009, at 1:09 AM, Lieven Govaerts wrote:

> Author: lgo
> Date: Wed May 13 23:09:20 2009
> New Revision: 37723
>
> Log:
> Fix issue in 'blame -g' where all chunks are not correctly
> identified as part of the same merged revision.
>
> Patch by: Alan Wood <Alan dot Wood at clear dot net dot nz>
> me (small tweaks, removed some changes, unneeded
> to make this test pass).
>
> * subversion/libsvn_cl​ient/blame.c
> (normalize_blames): Correctly insert new 'blame chunks'
> in the chain or merged chain, instead of losing some
> chunks in the process.
>
> * subversion/tests/cmd​line/blame_tess.py
> (test_list): Remove XFail wrapper from blame_output_after_merge
> test.
>
> Modified:
> trunk/subversion/lib​svn_client/blame.c
> trunk/subversion/tes​ts/cmdline/blame_tes​ts.py
>
> Modified: trunk/subversion/lib​svn_client/blame.c
> URL: http://svn.collab.ne​t/viewvc/svn/trunk/s​ubversion/libsvn_cli​ent/blame.c?pathrev=​37723&r1=37722​&r2=37723
> =
> =
> =
> =
> =
> =
> =
> =
> ====================​====================​====================​==========
> --- trunk/subversion/lib​svn_client/blame.c Wed May 13 14:13:08 2009
> (r37722)
> +++ trunk/subversion/lib​svn_client/blame.c Wed May 13 23:09:20 2009
> (r37723)
> @@ -526,18 +526,18 @@ normalize_blames(struct blame_chain *cha
> assert(walk->start == walk_merged->start);
>
> if (walk->next->start < walk_merged->next->start)
> - {
> - struct blame *tmp = blame_create(chain_merged,
> walk_merged->next->rev,
> + { /* insert a new chunk in CHAIN_MERGED. */

Stylistic nit: we usually put comments on a separate line, so they
don't get lost.

>
> + struct blame *tmp = blame_create(chain_merged,
> walk_merged->rev,
> walk->next->start);
> - tmp->next = walk_merged->next->next;
> + tmp->next = walk_merged->next;
> walk_merged->next = tmp;
> }
>
> if (walk->next->start > walk_merged->next->start)
> - {
> - struct blame *tmp = blame_create(chain, walk->next->rev,
> + { /* insert a new chunk in CHAIN. */

Same.

>
> + struct blame *tmp = blame_create(chain, walk->rev,
> walk_merged->next​->start);
> - tmp->next = walk->next->next;
> + tmp->next = walk->next;
> walk->next = tmp;
> }
> }
> ...

-Hyrum

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

Re: svn commit: r37723 - in trunk/subversion: libsvn_client tests/cmdline hwright Hyrum K. Wright 2009-05-14 05:16:15 PDT
Messages per page: