Author: dannas
Date: Sat Jul 10 08:20:01 2010
New Revision: 962788
URL: http://svn.apache.org/viewvc?rev=962788&view=rev
Log:
Follow-up to r962670. Adjust a diff test and remove XFail marker.
The values in the diff_cmd_baton were correct. I got fooled by the
other paths in the test beeing added and thus having this form:
svn diff -r 1
--- path (revision 0)
+++ path (revision 3)
But for non-added paths it should be:
--- path (revision 1)
+++ path (working copy)
* subversion/libsvn_client/diff.c
(diff_props_changed): Remove '###' comment about non-matching
behaviour for the revisions in the diff_cmd_baton. At the
same time, clarify why we're using revisions from that baton.
* subversion/tests/cmdline/diff_tests.py
(diff_prop_change_local_propmod): Adjust diff labels and remove
XFail markers.
Modified:
subversion/trunk/subversion/libsvn_client/diff.c
subversion/trunk/subversion/tests/cmdline/diff_tests.py
Modified: subversion/trunk/subversion/libsvn_client/diff.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/diff.c?rev=962788&r1=962787&r2=962788&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/diff.c Sat Jul 10 08:20:01 2010
@@ -635,10 +635,9 @@ diff_props_changed(const char *local_dir
if (props->nelts > 0)
{
- /* ### We're using the revnums from the diff_cmd_baton since there's
- * ### no revision argument to diff_props_changed(). But those revnums
- * ### don't always match the ones given by the diff callbacks. See
- * ### diff_test 32 for an example. */
+ /* We're using the revnums from the diff_cmd_baton since there's
+ * no revision argument to the svn_wc_diff_callback_t
+ * dir_props_changed(). */
SVN_ERR(display_prop_diffs(props, original_props, path,
diff_cmd_baton->orig_path_1,
diff_cmd_baton->orig_path_2,
Modified: subversion/trunk/subversion/tests/cmdline/diff_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/diff_tests.py?rev=962788&r1=962787&r2=962788&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/diff_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/diff_tests.py Sat Jul 10 08:20:01
2010
@@ -2336,9 +2336,9 @@ def diff_repos_wc_add_with_props(sbox):
"+propvalue\n",
]
- diff_X_r1_base = make_diff_header("X", "revision 0",
- "revision 3") + diff_X
- diff_X_base_r3 = make_diff_header("X", "revision 0",
+ diff_X_r1_base = make_diff_header("X", "revision 1",
+ "working copy") + diff_X
+ diff_X_base_r3 = make_diff_header("X", "working copy",
"revision 3") + diff_X
diff_foo_r1_base = make_diff_header("foo", "revision 0",
"revision 3") + diff_foo
@@ -3404,7 +3404,7 @@ test_list = [ None,
diff_property_changes_to_base,
diff_mime_type_changes,
diff_prop_change_local_propmod,
- XFail(diff_repos_wc_add_with_props),
+ diff_repos_wc_add_with_props,
diff_nonrecursive_checkout_deleted_dir,
diff_repos_working_added_dir,
diff_base_repos_moved,
