Author: stsp
Date: Thu Feb 17 14:51:52 2011
New Revision: 1071632
URL: http://svn.apache.org/viewvc?rev=1071632&view=rev
Log:
* subversion/svn/blame-cmd.c
(svn_cl__blame): Catch SVN_ERR_FS_NOT_FOUND and display warning.
* subversion/tests/cmdline/blame_tests.py
(blame_non_existent_url_target): Relax regex to allow errors from
http: and svn: protocols. Remove XFail marker.
Patch by: Noorul Islam K M <noorul{_AT_}collab.net>
Modified:
subversion/trunk/subversion/svn/blame-cmd.c
subversion/trunk/subversion/tests/cmdline/blame_tests.py
Modified: subversion/trunk/subversion/svn/blame-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/blame-cmd.c?rev=1071632&r1=1071631&r2=1071632&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/blame-cmd.c (original)
+++ subversion/trunk/subversion/svn/blame-cmd.c Thu Feb 17 14:51:52 2011
@@ -379,7 +379,8 @@ svn_cl__blame(apr_getopt_t *os,
target));
}
else if (err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND ||
- err->apr_err == SVN_ERR_FS_NOT_FILE)
+ err->apr_err == SVN_ERR_FS_NOT_FILE ||
+ err->apr_err == SVN_ERR_FS_NOT_FOUND)
{
svn_handle_warning2(stderr, err, "svn: ");
svn_error_clear(err);
Modified: subversion/trunk/subversion/tests/cmdline/blame_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/blame_tests.py?rev=1071632&r1=1071631&r2=1071632&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/blame_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/blame_tests.py Thu Feb 17
14:51:52 2011
@@ -741,7 +741,6 @@ def blame_non_existent_wc_target(sbox):
raise svntest.Failure('blame failed: expected error "%s", but received '
'"%s"' % (expected_err, "".join(error)))
-@XFail(svntest.main.is_ra_type_dav)
def blame_non_existent_url_target(sbox):
"blame non existent url target"
@@ -760,8 +759,7 @@ def blame_non_existent_url_target(sbox):
" 2 jrandom New contents for iota\n",
]
- expected_err = "svn: warning: W160017: '/non-existent' " + \
- "is not a file in revision 2\n" + \
+ expected_err = "svn: warning: (W160017|W160013): .*\n" + \
".*\nsvn: E200009: Could not perform blame on all targets " + \
"because some targets don't exist\n"
expected_err_re = re.compile(expected_err)
