Author: svn-role
Date: Wed Jul 10 04:00:05 2013
New Revision: 1501642
URL: http://svn.apache.org/r1501642
Log:
Merge r1495597 from trunk:
* r1495597
Fix a build warning, followup to already-merged r1493424.
Justification:
Makes the build warning-free (which in turn makes the bot useful).
Votes:
+1: danielsh, philip, rhuijben
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/svn/util.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1495597
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1501642&r1=1501641&r2=1501642&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Wed Jul 10 04:00:05 2013
@@ -159,10 +159,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1495597
- Fix a build warning, followup to already-merged r1493424.
- Justification:
- Makes the build warning-free (which in turn makes the bot useful).
- Votes:
- +1: danielsh, philip, rhuijben
Modified: subversion/branches/1.8.x/subversion/svn/util.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/svn/util.c?rev=1501642&r1=1501641&r2=1501642&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/svn/util.c (original)
+++ subversion/branches/1.8.x/subversion/svn/util.c Wed Jul 10 04:00:05 2013
@@ -1012,19 +1012,6 @@ svn_cl__local_style_skip_ancestor(const
return svn_dirent_local_style(relpath ? relpath : path, pool);
}
-/* Return a string of the form "PATH_OR_URL@REVISION". */
-static const char *
-path_for_display(const char *path_or_url,
- const svn_opt_revision_t *revision,
- apr_pool_t *pool)
-{
- const char *rev_str = svn_opt__revision_to_string(revision, pool);
-
- if (! svn_path_is_url(path_or_url))
- path_or_url = svn_dirent_local_style(path_or_url, pool);
- return apr_psprintf(pool, "%s@%s", path_or_url, rev_str);
-}
-
svn_error_t *
svn_cl__propset_print_binary_mime_type_warning(apr_array_header_t *targets,
const char *propname,
