On Thu, Oct 11, 2012 at 7:15 PM, Stefan Sperling <s...@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
