You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2013/07/05 19:24:29 UTC
svn commit: r1500076 - in /subversion/branches/1.8.x: ./ STATUS
subversion/libsvn_client/switch.c
Author: danielsh
Date: Fri Jul 5 17:24:29 2013
New Revision: 1500076
URL: http://svn.apache.org/r1500076
Log:
* STATUS: Nominate r1500074.
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/libsvn_client/switch.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1500074
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1500076&r1=1500075&r2=1500076&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Fri Jul 5 17:24:29 2013
@@ -237,9 +237,14 @@ Candidate changes:
Spurious FAILs confuse people testing the release.
Votes:
+1: philip
- -0: danielsh (loses functionality: this is the only test for @{DATE} pegs,
- and it should test that that works when the {DATE} argument
- is not exactly equal to the revprop's value)
+ -0: danielsh (loses functionality; patch sent with alternative fix)
+
+ * r1500074
+ Format a path correctly in an error message.
+ Justification:
+ The error message includes a path not related to the working copy
+ Votes:
+ +1: danielsh
Veto-blocked changes:
=====================
Modified: subversion/branches/1.8.x/subversion/libsvn_client/switch.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_client/switch.c?rev=1500076&r1=1500075&r2=1500076&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_client/switch.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_client/switch.c Fri Jul 5 17:24:29 2013
@@ -241,7 +241,7 @@ switch_internal(svn_revnum_t *result_rev
return svn_error_createf(SVN_ERR_CLIENT_UNRELATED_RESOURCES, NULL,
_("'%s' shares no common ancestry with '%s'"),
switch_url,
- svn_dirent_dirname(local_abspath, pool));
+ svn_dirent_local_style(local_abspath, pool));
}
wcroot_iprops = apr_hash_make(pool);