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

Posted to commits@subversion.apache.org by ju...@apache.org on 2013/01/24 02:32:11 UTC

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

Author: julianfoad
Date: Thu Jan 24 01:32:10 2013
New Revision: 1437828

URL: http://svn.apache.org/viewvc?rev=1437828&view=rev
Log:
* subversion/libsvn_wc/conflicts.c
  (svn_wc__conflict_invoke_resolver): Fix an erroneous swapping of
    the 'left' and 'mine' text conflict 'artifact' files.

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=1437828&r1=1437827&r2=1437828&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Thu Jan 24 01:32:10 2013
@@ -1903,8 +1903,8 @@ svn_wc__conflict_invoke_resolver(svn_wc_
       svn_skel_t *work_items;
       svn_boolean_t was_resolved;
 
-      SVN_ERR(svn_wc__conflict_read_text_conflict(&their_original_abspath,
-                                                  &mine_abspath,
+      SVN_ERR(svn_wc__conflict_read_text_conflict(&mine_abspath,
+                                                  &their_original_abspath,
                                                   &their_abspath,
                                                   db, local_abspath,
                                                   conflict_skel,