Author: dannas
Date: Mon Jul 19 07:38:14 2010
New Revision: 965376
URL: http://svn.apache.org/viewvc?rev=965376&view=rev
Log:
* subversion/libsvn_client/diff.c
(display_prop_diffs): Remove code for handling relative_to_dir. That
logic exists in adjust_paths_for_diff_labels() now.
Modified:
subversion/trunk/subversion/libsvn_client/diff.c
Modified: subversion/trunk/subversion/libsvn_client/diff.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/diff.c?rev=965376&r1=965375&r2=965376&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/diff.c Mon Jul 19 07:38:14 2010
@@ -321,20 +321,6 @@ display_prop_diffs(const apr_array_heade
{
int i;
- if (relative_to_dir)
- {
- /* Possibly adjust the path shown in the output (see issue #2723). */
- const char *child_path = svn_dirent_is_child(relative_to_dir, path,
- pool);
-
- if (child_path)
- path = child_path;
- else if (!svn_path_compare_paths(relative_to_dir, path))
- path = ".";
- else
- return MAKE_ERR_BAD_RELATIVE_PATH(path, relative_to_dir);
- }
-
/* If we're creating a diff on the wc root, path would be empty. */
if (path[0] == '\0')
path = apr_psprintf(pool, ".");
