Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@subversion.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1337525 - /subversion/trunk/subversion/libsvn_wc/wc_db.c
Date: Sat, 12 May 2012 12:48:40 -0000
To: commits@subversion.apache.org
From: stsp@apache.org
Message-Id: <20120512124840.D0BEF2388978@eris.apache.org>

Author: stsp
Date: Sat May 12 12:48:40 2012
New Revision: 1337525

URL: http://svn.apache.org/viewvc?rev=1337525&view=rev
Log:
* subversion/libsvn_wc/wc_db.c
  (svn_wc__db_read_conflicts): Set the 'merged_file' of a text conflict
    description to an absolute path, rather than just a basename. Fixes
    'diff-full' during 'svn resolve' for files residing in subdirectories.

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

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1337525&r1=1337524&r2=1337525&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Sat May 12 12:48:40 2012
@@ -11439,7 +11439,7 @@ svn_wc__db_read_conflicts(const apr_arra
           if (conflict_working)
             desc->my_abspath = svn_dirent_join(wcroot->abspath,
                                                conflict_working, result_pool);
-          desc->merged_file = svn_dirent_basename(local_abspath, result_pool);
+          desc->merged_file = apr_pstrdup(result_pool, local_abspath);
 
           APR_ARRAY_PUSH(cflcts, svn_wc_conflict_description2_t*) = desc;
         }