What about the case where that file already exists and another name is used?
Bert Huijben (mobile phone)
----- Oorspronkelijk bericht -----
Van: gstein_at_apache.org
Verzonden: dinsdag 27 april 2010 2:09
Aan: commits_at_subversion.apache.org
Onderwerp: svn commit: r938274 - /subversion/trunk/subversion/libsvn_wc/props.c
Author: gstein
Date: Tue Apr 27 00:09:27 2010
New Revision: 938274
URL: http://svn.apache.org/viewvc?rev=938274&view=rev
Log:
Followup to r938268: trying to detect whether the rejects applied to the
directory or a child, the check was goofed. Gotta add the file extension.
* subversion/libsvn_wc/props.c:
(svn_wc__get_prejfile_abspath): include the extension on the filename
Modified:
subversion/trunk/subversion/libsvn_wc/props.c
Modified: subversion/trunk/subversion/libsvn_wc/props.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/props.c?rev=938274&r1=938273&r2=938274&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/props.c (original)
+++ subversion/trunk/subversion/libsvn_wc/props.c Tue Apr 27 00:09:27 2010
@@ -287,10 +287,12 @@ svn_wc__get_prejfile_abspath(const char
if (cd->kind == svn_wc_conflict_kind_property)
{
- if (strcmp(cd->their_file, SVN_WC__THIS_DIR_PREJ) == 0)
- *prejfile_abspath = svn_dirent_join(local_abspath,
- SVN_WC__THIS_DIR_PREJ,
- result_pool);
+ if (strcmp(cd->their_file,
+ SVN_WC__THIS_DIR_PREJ SVN_WC__PROP_REJ_EXT) == 0)
+ *prejfile_abspath = svn_dirent_join(
+ local_abspath,
+ SVN_WC__THIS_DIR_PREJ SVN_WC__PROP_REJ_EXT,
+ result_pool);
else
*prejfile_abspath = svn_dirent_join(
svn_dirent_dirname(local_abspath,
Received on 2010-04-27 09:16:25 CEST