[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: Hyrum K Wright <hyrum_at_hyrumwright.org>
Date: Thu, 11 Oct 2012 23:45:20 -0400

On Thu, Oct 11, 2012 at 7:15 PM, Stefan Sperling <stsp_at_elego.de> wrote:
> 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!

r1397425

-Hyrum

>
>> [[[
>> 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 05:46:02 CEST

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