Re: [PATCH] Issue #3919: fix for spurious property conflict during merge

Hi Stefan - On Wed, Jun 15, 2011 at 9:23 AM, Stefan Sperling wrote: > > Committed in r1136063. Thank you! > >> > Also, did you already run the regression tests with your patch ("make >> > check")? My suggestion might affect the output of 'svn' so tests would >> > need to be run again (but I wil

Re: [PATCH] Issue #3919: fix for spurious property conflict during merge

Hi Stefan, > thanks for this patch. > > I have one suggestion: > > [...] > > Instead of doing nothing, I think this should set the *state to 'merged' > using > >        set_prop_merge_state(state, svn_wc_notify_state_merged); > > Just like apply_single_prop_add() already does. > > Do you agree? If

Re: [PATCH] Issue #3919: fix for spurious property conflict during merge

On Sat, Jun 11, 2011 at 11:36 PM, noorul Islam. Kamal Malmiyoda wrote: > >> > > I think conditions can be combined to form one "if" statement without "else > if". > > Thanks and Regards > Noorul Hello - I'm not sure I follow you, can you please explain a bit more? I'm not sure how you could ca

[PATCH] Issue #3919: fix for spurious property conflict during merge

Hello - Attached is a patch for issue #3919 [1]. Please review when you have a chance. Thanks! Possible commit message: [[[ Fix issue #3919. During a merge of a property, add a check against the incoming new property value and the working copy value. If they already match, then the merge trivial