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

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

From: Brian Neal <bgneal_at_gmail.com>
Date: Sat, 11 Jun 2011 15:05:59 -0500

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 trivially succeeds.

* subversion/libsvn_wc/props.c
  (apply_single_generic_prop_change): Do nothing if the incoming new
property value already matches the working value.


[1]: http://subversion.tigris.org/issues/show_bug.cgi?id=3919

Best regards,

Received on 2011-06-11 22:06:34 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.