Author: rhuijben
Date: Wed Jul 13 19:30:25 2011
New Revision: 1146274
URL: http://svn.apache.org/viewvc?rev=1146274&view=rev
Log:
* subversion/libsvn_wc/info.c
(build_info_for_unversioned): Fill structures to the right 'undefined' values
instead of relying on apr_pcalloc().
* subversion/tests/cmdline/tree_conflict_tests.py
(actual_only_node_behaviour): Update expected result. Remove values as they
are no longer part of the svn info output.
Found by: stsp
(when he wrote the test)
Modified:
subversion/trunk/subversion/libsvn_wc/info.c
subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py
Modified: subversion/trunk/subversion/libsvn_wc/info.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/info.c?rev=1146274&r1=1146273&r2=1146274&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/info.c (original)
+++ subversion/trunk/subversion/libsvn_wc/info.c Wed Jul 13 19:30:25 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/trunk/subversion/tests/cmdline/tree_conflict_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py?rev=1146274&r1=1146273&r2=1146274&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py Wed Jul 13
19:30:25 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)
