On Thu, Oct 11, 2012 at 7:15 PM, Stefan Sperling 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
>> =
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 (revisi
On Thu, Oct 11, 2012 at 3:01 PM, Stefan Sperling wrote:
> On Thu, Oct 11, 2012 at 12:20:32PM -0400, Hyrum K Wright wrote:
>> > + /* Compute the incoming side of the conflict ('action'). */
>> > + if (their_value == NULL)
>> > +desc->action = svn_wc_conflict_action_delete;
>> > +
On Thu, Oct 11, 2012 at 12:20:32PM -0400, Hyrum K Wright wrote:
> > + /* Compute the incoming side of the conflict ('action'). */
> > + if (their_value == NULL)
> > +desc->action = svn_wc_conflict_action_delete;
> > + else if (my_value == NULL)
> > +desc->action = svn
On Wed, Sep 19, 2012 at 2:06 PM, wrote:
> Author: stsp
> Date: Wed Sep 19 18:06:13 2012
> New Revision: 1387696
>
> URL: http://svn.apache.org/viewvc?rev=1387696&view=rev
> Log:
> * subversion/libsvn_wc/conflicts.c
> (read_prop_conflicts): New helper to prepare for the times when new
> conf
5 matches
Mail list logo
