You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2012/05/15 15:47:29 UTC

svn commit: r1338708 - /subversion/trunk/subversion/libsvn_client/diff.c

Author: stsp
Date: Tue May 15 13:47:29 2012
New Revision: 1338708

URL: http://svn.apache.org/viewvc?rev=1338708&view=rev
Log:
* subversion/libsvn_client/diff.c
  (resolve_pegged_diff_target_url): Ignore SVN_ERR_FS_NOT_FOUND in addition
   to SVN_ERR_CLIENT_UNRELATED_RESOURCES. This allows "svn diff -cN foo"
   to work if foo was deleted in rN. The generated diff shows 'foo' as deleted.
   Note that "svn log --diff -cN foo" still does not work in that case
   because the log command bails out before calling into the diff code.

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=1338708&r1=1338707&r2=1338708&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/diff.c Tue May 15 13:47:29 2012
@@ -1528,7 +1528,8 @@ resolve_pegged_diff_target_url(const cha
                                     ctx, scratch_pool);
   if (err)
     {
-      if (err->apr_err == SVN_ERR_CLIENT_UNRELATED_RESOURCES)
+      if (err->apr_err == SVN_ERR_CLIENT_UNRELATED_RESOURCES ||
+          err->apr_err == SVN_ERR_FS_NOT_FOUND)
         {
           svn_error_clear(err);
           *resolved_url = NULL;