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

Re: svn commit: r1387696 - /subversion/trunk/subversion/libsvn_wc/conflicts.c

From: Stefan Sperling <stsp_at_elego.de>
Date: Fri, 12 Oct 2012 01:15:49 +0200

On Thu, Oct 11, 2012 at 05:25:03PM -0400, Hyrum K Wright wrote:
> Does this (untested) patch make sense?

Oh yes, very much! Thanks!

> [[[
> Index: subversion/libsvn_wc/conflicts.c
> ===================================================================
> --- subversion/libsvn_wc/conflicts.c (revision 1397318)
> +++ subversion/libsvn_wc/conflicts.c (working copy)
> @@ -2000,9 +2000,9 @@
> if (my_value == NULL)
> desc->reason = svn_wc_conflict_reason_deleted;
> else if (their_value == NULL)
> - desc->action = svn_wc_conflict_reason_added;
> + desc->reason = svn_wc_conflict_reason_added;
> else
> - desc->action = svn_wc_conflict_reason_edited;
> + desc->reason = svn_wc_conflict_reason_edited;
>
> /* ### This should be changed. The prej file should be stored
> * ### separately from the other files. We need to rev the
> ]]]
>
> -Hyrum
Received on 2012-10-12 01:16:28 CEST

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