You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2011/05/05 22:30:37 UTC
svn commit: r1099959 - /subversion/trunk/subversion/libsvn_wc/info.c
Author: julianfoad
Date: Thu May 5 20:30:36 2011
New Revision: 1099959
URL: http://svn.apache.org/viewvc?rev=1099959&view=rev
Log:
* subversion/libsvn_wc/info.c
(svn_wc__get_info): When reporting a tree conflict on a path at which
there is no node, report the repos UUID along with the root URL,
as the two go together and there is no reason not to.
Modified:
subversion/trunk/subversion/libsvn_wc/info.c
Modified: subversion/trunk/subversion/libsvn_wc/info.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/info.c?rev=1099959&r1=1099958&r2=1099959&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/info.c (original)
+++ subversion/trunk/subversion/libsvn_wc/info.c Thu May 5 20:30:36 2011
@@ -410,8 +410,8 @@ svn_wc__get_info(svn_wc_context_t *wc_ct
svn_info2_t *info;
SVN_ERR(build_info_for_unversioned(&info, iterpool));
- SVN_ERR(svn_wc__internal_get_repos_info(&(info->repos_root_URL),
- NULL,
+ SVN_ERR(svn_wc__internal_get_repos_info(&info->repos_root_URL,
+ &info->repos_UUID,
fe_baton.db,
local_abspath, FALSE, FALSE,
iterpool, iterpool));