Author: hwright
Date: Thu Jul 14 20:06:40 2011
New Revision: 1146878
URL: http://svn.apache.org/viewvc?rev=1146878&view=rev
Log:
Merge r1146274 from trunk:
* r1146274
Make svn_client_infoX() return proper results for tree conflicts. Without
this patch the structure is just memcleared instead of properly set to
uninitialized.
Justification:
Resolve regression and remove confusion by future callers.
Votes:
+1: rhuijben, gstein, stsp
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_wc/info.c
subversion/branches/1.7.x/subversion/tests/cmdline/tree_conflict_tests.py
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 14 20:06:40 2011
@@ -53,4 +53,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146219,1146222
+/subversion/trunk:1146013,1146219,1146222,1146274
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1146878&r1=1146877&r2=1146878&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Thu Jul 14 20:06:40 2011
@@ -52,15 +52,6 @@ Candidate changes:
Approved changes:
=================
- * r1146274
- Make svn_client_infoX() return proper results for tree conflicts. Without
- this patch the structure is just memcleared instead of properly set to
- uninitialized.
- Justification:
- Resolve regression and remove confusion by future callers.
- Votes:
- +1: rhuijben, gstein, stsp
-
* r1146492, r1146555
Add const to a couple members of svn_client_info2_t
Justification:
Modified: subversion/branches/1.7.x/subversion/libsvn_wc/info.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_wc/info.c?rev=1146878&r1=1146877&r2=1146878&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_wc/info.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_wc/info.c Thu Jul 14 20:06:40
2011
@@ -301,18 +301,24 @@ build_info_for_unversioned(svn_wc__info2
apr_pool_t *pool)
{
svn_wc__info2_t *tmpinfo = apr_pcalloc(pool, sizeof(*tmpinfo));
- tmpinfo->wc_info = apr_pcalloc(pool, sizeof (*tmpinfo->wc_info));
+ svn_wc_info_t *wc_info = apr_pcalloc(pool, sizeof (*wc_info));
tmpinfo->URL = NULL;
- tmpinfo->rev = SVN_INVALID_REVNUM;
- tmpinfo->kind = svn_node_none;
tmpinfo->repos_UUID = NULL;
tmpinfo->repos_root_URL = NULL;
+ tmpinfo->rev = SVN_INVALID_REVNUM;
+ tmpinfo->kind = svn_node_none;
+ tmpinfo->size = SVN_INVALID_FILESIZE;
tmpinfo->last_changed_rev = SVN_INVALID_REVNUM;
tmpinfo->last_changed_date = 0;
tmpinfo->last_changed_author = NULL;
tmpinfo->lock = NULL;
- tmpinfo->size = SVN_INVALID_FILESIZE;
+
+ tmpinfo->wc_info = wc_info;
+
+ wc_info->copyfrom_rev = SVN_INVALID_REVNUM;
+ wc_info->depth = svn_depth_unknown;
+ wc_info->recorded_size = SVN_INVALID_FILESIZE;
*info = tmpinfo;
return SVN_NO_ERROR;
Modified:
subversion/branches/1.7.x/subversion/tests/cmdline/tree_conflict_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/tests/cmdline/tree_conflict_tests.py?rev=1146878&r1=1146877&r2=1146878&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/tests/cmdline/tree_conflict_tests.py
(original)
+++ subversion/branches/1.7.x/subversion/tests/cmdline/tree_conflict_tests.py
Thu Jul 14 20:06:40 2011
@@ -1224,8 +1224,6 @@ def actual_only_node_behaviour(sbox):
'Name': 'foo',
'Schedule': 'normal',
'Node Kind': 'none',
- 'Depth': 'empty', ### is this right?
- 'Copied From Rev': '0',
'Path': re.escape(sbox.ospath('A/foo')),
}
run_and_verify_info([expected_info], foo_path)
