Author: julianfoad
Date: Mon Jun 6 10:01:02 2011
New Revision: 1132567
URL: http://svn.apache.org/viewvc?rev=1132567&view=rev
Log:
Remove a newly added field from the deprecated 'svn_info_t' structure,
as it is neither used nor needed.
* subversion/include/svn_client.h
(svn_info_t): Remove the 'wcroot_abspath' field.
* subversion/libsvn_client/info.c
(svn_info_dup): Don't copy the 'wcroot_abspath' field.
* subversion/libsvn_wc/info.c
(build_info_for_unversioned): Adjust the doc string to mention svn_info2_t
instead of svn_info_t.
Modified:
subversion/trunk/subversion/include/svn_client.h
subversion/trunk/subversion/libsvn_client/info.c
subversion/trunk/subversion/libsvn_wc/info.c
Modified: subversion/trunk/subversion/include/svn_client.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=1132567&r1=1132566&r2=1132567&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Mon Jun 6 10:01:02 2011
@@ -5294,12 +5294,6 @@ typedef struct svn_info_t
*/
svn_wc_conflict_description_t *tree_conflict;
- /**
- * The local absolute path of the working copy root.
- * @since New in 1.7.
- */
- const char *wcroot_abspath;
-
/** @} */
} svn_info_t;
Modified: subversion/trunk/subversion/libsvn_client/info.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/info.c?rev=1132567&r1=1132566&r2=1132567&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/info.c (original)
+++ subversion/trunk/subversion/libsvn_client/info.c Mon Jun 6 10:01:02 2011
@@ -409,8 +409,6 @@ svn_info_dup(const svn_info_t *info, apr
dupinfo->conflict_wrk = apr_pstrdup(pool, info->conflict_wrk);
if (info->prejfile)
dupinfo->prejfile = apr_pstrdup(pool, info->prejfile);
- if (info->wcroot_abspath)
- dupinfo->wcroot_abspath = apr_pstrdup(pool, info->wcroot_abspath);
return dupinfo;
}
Modified: subversion/trunk/subversion/libsvn_wc/info.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/info.c?rev=1132567&r1=1132566&r2=1132567&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/info.c (original)
+++ subversion/trunk/subversion/libsvn_wc/info.c Mon Jun 6 10:01:02 2011
@@ -251,7 +251,7 @@ build_info_for_entry(svn_info2_t **info,
}
-/* Helper: build an svn_info_t *INFO struct with minimal content, to be
+/* Helper: build an svn_info2_t *INFO struct with minimal content, to be
used in reporting info for unversioned tree conflict victims. */
/* ### Some fields we could fill out based on the parent dir's entry
or by looking at an obstructing item. */
