You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by rh...@apache.org on 2012/07/26 21:30:50 UTC

svn commit: r1366168 - /subversion/trunk/subversion/libsvn_wc/conflicts.c

Author: rhuijben
Date: Thu Jul 26 19:30:50 2012
New Revision: 1366168

URL: http://svn.apache.org/viewvc?rev=1366168&view=rev
Log:
* subversion/libsvn_wc/conflicts.c
  (svn_wc__conflict_invoke_resolver): Fix property reference.

Found by: julian

Modified:
    subversion/trunk/subversion/libsvn_wc/conflicts.c

Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1366168&r1=1366167&r2=1366168&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Thu Jul 26 19:30:50 2012
@@ -1828,7 +1828,7 @@ svn_wc__conflict_invoke_resolver(svn_wc_
         SVN_ERR(svn_wc__db_read_pristine_props(&old_props, db, local_abspath,
                                                scratch_pool, scratch_pool));
       else
-        old_props = their_original_props;
+        old_props = old_their_props;
 
       iterpool = svn_pool_create(scratch_pool);