Hi,
Pl. find attached a simple patch that removes an comment thats no
longer relevant (on the merge-tracking branch).
[[[
Remove irrelevant comment.
(In branches/merge-tracking)
* subversion/libsvn_client/diff.c:
(parse_merge_info): We already use svn_client__get_prop_from_wc().
]]]
Regards,
Madan.
Remove irrelevant comment.
(In branches/merge-tracking)
* subversion/libsvn_client/diff.c:
(parse_merge_info): We already use svn_client__get_prop_from_wc().
Index: subversion/libsvn_client/diff.c
===================================================================
--- subversion/libsvn_client/diff.c (revision 20533)
+++ subversion/libsvn_client/diff.c (working copy)
@@ -1663,9 +1663,6 @@
_("'%s' is not under version control"),
svn_path_local_style(wcpath, pool));
- /* ### Use svn_wc_prop_get() would actually be sufficient for now.
- ### DannyB thinks that later we'll need behavior more like
- ### svn_client__get_prop_from_wc(). */
SVN_ERR(svn_client__get_prop_from_wc(props, SVN_PROP_MERGE_INFO,
wcpath, FALSE, entry, adm_access,
TRUE, ctx, pool));
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Jul 11 19:09:28 2006