Author: stsp
Date: Wed Feb 16 18:38:42 2011
New Revision: 1071357
URL: http://svn.apache.org/viewvc?rev=1071357&view=rev
Log:
Follow-up to r1064436:
Fix a copy-pasto that caused an assertion failure with
"svn diff --old=. --new=^/subversion/trunk":
assertion "svn_dirent_is_canonical(base, pool)" failed: file \
"subversion/libsvn_subr/dirent_uri.c", line 1010, function "svn_dirent_join"
* subversion/svn/diff-cmd.c
(svn_cl__diff): We want to check if the new target is a URL. We've already
checked the old one.
Modified:
subversion/trunk/subversion/svn/diff-cmd.c
Modified: subversion/trunk/subversion/svn/diff-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/diff-cmd.c?rev=1071357&r1=1071356&r2=1071357&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/diff-cmd.c (original)
+++ subversion/trunk/subversion/svn/diff-cmd.c Wed Feb 16 18:38:42 2011
@@ -330,7 +330,7 @@ svn_cl__diff(apr_getopt_t *os,
target1 = svn_path_url_add_component2(old_target, path, iterpool);
else
target1 = svn_dirent_join(old_target, path, iterpool);
- if (svn_path_is_url(old_target))
+ if (svn_path_is_url(new_target))
target2 = svn_path_url_add_component2(new_target, path, iterpool);
else
target2 = svn_dirent_join(new_target, path, iterpool);
