Hi All,

~/tunk-build/bin/svn di -c1035797 https://svn.apache.org/repos/asf/subversion/branches/1.6.x --git
throws the following assertion error.

svn: ../subversion/libsvn_subr/dirent_uri.c:1199: svn_relpath_join: Assertion `relpath_is_canonical(component)' failed.


Attached patch fixes it.

Did *not* run the testsuite would commit it later.

With regards
Kamesh Jayachandran
Index: subversion/libsvn_client/diff.c
===================================================================
--- subversion/libsvn_client/diff.c     (revision 1040586)
+++ subversion/libsvn_client/diff.c     (working copy)
@@ -574,10 +574,6 @@
   const char *path1 = apr_pstrdup(pool, orig_path1);
   const char *path2 = apr_pstrdup(pool, orig_path2);
 
-  /* If we're creating a diff on the wc root, path would be empty. */
-  if (path[0] == '\0')
-    path = apr_psprintf(pool, ".");
-
   if (use_git_diff_format)
     {
       SVN_ERR(adjust_relative_to_repos_root(&path1, path, orig_path1,

Reply via email to