[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH] conflict notifications hunks has wrong modified_length

From: Stefan Sperling <stsp_at_elego.de>
Date: Thu, 28 Jan 2010 10:58:17 +0100

On Wed, Jan 27, 2010 at 10:30:51PM +0100, Daniel Näslund wrote:
> Hi!
>
> [[[
> Fix wrong modified_length for hunk notifications.
>
> * subversion/libsvn_client/patch.c
> (maybe_send_patch_notification): See above.
>
> Patch by: Daniel Näslund <daniel{_AT_}longitudo.com>
> ]]]

> Index: subversion/libsvn_client/patch.c
> ===================================================================
> --- subversion/libsvn_client/patch.c (revision 903785)
> +++ subversion/libsvn_client/patch.c (arbetskopia)
> @@ -1000,7 +1000,7 @@
> notify->hunk_original_start = hi->hunk->original_start;
> notify->hunk_original_length = hi->hunk->original_length;
> notify->hunk_modified_start = hi->hunk->modified_start;
> - notify->hunk_modified_length = hi->hunk->original_length;
> + notify->hunk_modified_length = hi->hunk->modified_length;

Oops :)

Don't some tests need their expected output adjusted for this?

Stefan
Received on 2010-01-28 10:59:06 CET

This is an archived mail posted to the Subversion Dev mailing list.