You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2013/11/24 05:28:13 UTC
svn commit: r1544909 - in /subversion/trunk/subversion: libsvn_repos/dump.c
tests/cmdline/svnadmin_tests.py
Author: brane
Date: Sun Nov 24 04:28:12 2013
New Revision: 1544909
URL: http://svn.apache.org/r1544909
Log:
Grrrr. Directories are not files, at least most of the time.
* subversion/libsvn_repos/dump.c (add_directory):
Don't lie to check_ucs_normalization.
* subversion/tests/cmdline/svnadmin_tests.py (verify_denormalized_names):
Update expected output now that directories are not reported as files.
Modified:
subversion/trunk/subversion/libsvn_repos/dump.c
subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
Modified: subversion/trunk/subversion/libsvn_repos/dump.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/dump.c?rev=1544909&r1=1544908&r2=1544909&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/dump.c (original)
+++ subversion/trunk/subversion/libsvn_repos/dump.c Sun Nov 24 04:28:12 2013
@@ -1166,7 +1166,7 @@ add_directory(const char *path,
{
pb->check_name_collision = TRUE;
SVN_ERR(check_ucs_normalization(
- path, svn_node_file,
+ path, svn_node_dir,
eb->notify_func, eb->notify_baton, pool));
}
Modified: subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py?rev=1544909&r1=1544908&r2=1544909&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py Sun Nov 24 04:28:12 2013
@@ -2056,8 +2056,8 @@ def verify_denormalized_names(sbox):
exp_out = svntest.verify.RegexListOutput([
".*Verifying repository metadata",
".*Verified revision 0.",
- # A/{Eacute}
- "WARNING .*: Denormalized file name 'A/.*'",
+ # A/{Eacute}
+ "WARNING .*: Denormalized directory name 'A/.*'",
# A/{icircumflex}{odiaeresis}ta
"WARNING .*: Denormalized file name 'A/.*ta'",
".*Verified revision 1.",