Author: dannas
Date: Sat Jul 10 19:22:05 2010
New Revision: 962905
URL: http://svn.apache.org/viewvc?rev=962905&view=rev
Log:
For consistency, use '/' as separators for all paths in a diff.
Previously the 'Property changes' line used the system
specific separator.
* subversion/libsvn_client/diff.c
(display_prop_diffs): Remove call to svn_dirent_local_style().
* subversion/tests/cmdline/diff_tests.py
(diff_repos_wc_add_with_props,
(diff_with_depth): Use '/' as separator.
* subversion/tests/cmdline/merge_tests.py
(merge_in_new_file_and_diff): Use '/' as separator.
Modified:
subversion/trunk/subversion/libsvn_client/diff.c
subversion/trunk/subversion/tests/cmdline/diff_tests.py
subversion/trunk/subversion/tests/cmdline/merge_tests.py
Modified: subversion/trunk/subversion/libsvn_client/diff.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/diff.c?rev=962905&r1=962904&r2=962905&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/diff.c Sat Jul 10 19:22:05 2010
@@ -369,7 +369,7 @@ display_prop_diffs(const apr_array_heade
SVN_ERR(file_printf_from_utf8(file, encoding,
_("%sProperty changes on: %s%s"),
APR_EOL_STR,
- svn_dirent_local_style(path, pool),
+ path,
APR_EOL_STR));
SVN_ERR(file_printf_from_utf8(file, encoding, "%s" APR_EOL_STR,
Modified: subversion/trunk/subversion/tests/cmdline/diff_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/diff_tests.py?rev=962905&r1=962904&r2=962905&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/diff_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/diff_tests.py Sat Jul 10 19:22:05
2010
@@ -2329,7 +2329,7 @@ def diff_repos_wc_add_with_props(sbox):
"@@ -0,0 +1 @@\n",
"+content\n",
"\n",
- "Property changes on: " + os.path.join('X', 'bar') + "\n",
+ "Property changes on: X/bar\n",
"___________________________________________________________________\n",
"Added: propname\n",
"## -0,0 +1 ##\n",
@@ -2776,7 +2776,7 @@ def diff_with_depth(sbox):
"## -0,0 +1 ##\n",
"+bar3\n",
"\n",
- "Property changes on: " + os.path.join('A', 'B') + "\n",
+ "Property changes on: A/B\n",
"___________________________________________________________________\n",
"Added: foo4\n",
"## -0,0 +1 ##\n",
@@ -2863,7 +2863,7 @@ def diff_with_depth(sbox):
"--- A/B\t(revision 2)\n",
"+++ A/B\t(working copy)\n",
"\n",
- "Property changes on: " + os.path.join('A', 'B') + "\n",
+ "Property changes on: A/B\n",
"___________________________________________________________________\n",
"Modified: foo4\n",
"## -1 +1 ##\n",
Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=962905&r1=962904&r2=962905&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Sat Jul 10
19:22:05 2010
@@ -1330,7 +1330,7 @@ def merge_in_new_file_and_diff(sbox):
"--- "+ url_branch_path + "\t(revision 2)\n",
"+++ "+ url_branch_path + "\t(working copy)\n",
"\n",
- "Property changes on: " + branch_path + "\n",
+ "Property changes on: " + url_branch_path + "\n",
"___________________________________________________________________\n",
"Added: " + SVN_PROP_MERGEINFO + "\n",
" Merged /A/B/E:r2-3\n",
