Author: pburba
Date: Thu Feb 4 00:44:26 2010
New Revision: 906305
URL: http://svn.apache.org/viewvc?rev=906305&view=rev
Log:
Fix issue #3573 'local non-inheritable mergeinfo changes not properly merged
with updated mergeinfo'.
When merging incoming mergeinfo updates with local mergeinfo changes, the
inheritablity of the mergeinfo is quite relevant!
* subversion/libsvn_wc/props.c
(diff_mergeinfo_props): Consider the inheritance of the mergeinfo
properties being diffed.
* subversion/tests/cmdline/update_tests.py
(mergeinfo_updates_merge_with_local_mods): Tweak note about XFail.
(test_list): Remove XFail from mergeinfo_updates_merge_with_local_mods.
Modified:
subversion/trunk/subversion/libsvn_wc/props.c
subversion/trunk/subversion/tests/cmdline/update_tests.py
Modified: subversion/trunk/subversion/libsvn_wc/props.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/props.c?rev=906305&r1=906304&r2=906305&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/props.c (original)
+++ subversion/trunk/subversion/libsvn_wc/props.c Thu Feb 4 00:44:26 2010
@@ -704,7 +704,7 @@
SVN_ERR(svn_mergeinfo_parse(&from, from_prop_val->data, pool));
SVN_ERR(svn_mergeinfo_parse(&to, to_prop_val->data, pool));
SVN_ERR(svn_mergeinfo_diff(deleted, added, from, to,
- FALSE, pool));
+ TRUE, pool));
}
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/tests/cmdline/update_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/update_tests.py?rev=906305&r1=906304&r2=906305&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/update_tests.py Thu Feb 4
00:44:26 2010
@@ -5186,7 +5186,7 @@
# Update the WC (to r8), the mergeinfo on A_COPY should now have both
# the local mod from the uncommitted merge (/A:3* --> /A:3) and the change
# brought down by the update (/A:3* --> /A:3*,5) leaving us with /A:3,5.
- ### Currently this fails because of issue #3573. The local mergeinfo change
+ ### This was failing because of issue #3573. The local mergeinfo change
### is reverted, leaving '/A:3*,5' on A_COPY.
svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
svntest.actions.run_and_verify_svn(None, [A_COPY_path + " - /A:3,5\n"], [],
@@ -5260,7 +5260,7 @@
update_wc_of_dir_to_rev_not_containing_this_dir,
XFail(update_deleted_locked_files),
XFail(update_empty_hides_entries),
- XFail(mergeinfo_updates_merge_with_local_mods),
+ mergeinfo_updates_merge_with_local_mods,
]
if __name__ == '__main__':
