You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2011/04/22 00:37:35 UTC
svn commit: r1095838 - in /subversion/trunk/subversion:
libsvn_wc/questions.c svn/status.c
Author: rhuijben
Date: Thu Apr 21 22:37:34 2011
New Revision: 1095838
URL: http://svn.apache.org/viewvc?rev=1095838&view=rev
Log:
Fix a problem found by a specific stat test in two places:
* subversion/libsvn_wc/questions.c
(svn_wc__internal_conflicted_p): Initialize output arguments before the
first error possibility.
* subversion/svn/status.c
(print_status): Don't assume output arguments are valid on errors.
Fix ordering.
Modified:
subversion/trunk/subversion/libsvn_wc/questions.c
subversion/trunk/subversion/svn/status.c
Modified: subversion/trunk/subversion/libsvn_wc/questions.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/questions.c?rev=1095838&r1=1095837&r2=1095838&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/questions.c (original)
+++ subversion/trunk/subversion/libsvn_wc/questions.c Thu Apr 21 22:37:34 2011
@@ -462,13 +462,6 @@ svn_wc__internal_conflicted_p(svn_boolea
int i;
svn_boolean_t conflicted;
- SVN_ERR(svn_wc__db_read_info(NULL, &node_kind, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, &conflicted,
- NULL, NULL, NULL, NULL, NULL, NULL,
- db, local_abspath, scratch_pool,
- scratch_pool));
-
if (text_conflicted_p)
*text_conflicted_p = FALSE;
if (prop_conflicted_p)
@@ -476,6 +469,13 @@ svn_wc__internal_conflicted_p(svn_boolea
if (tree_conflicted_p)
*tree_conflicted_p = FALSE;
+ SVN_ERR(svn_wc__db_read_info(NULL, &node_kind, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, &conflicted,
+ NULL, NULL, NULL, NULL, NULL, NULL,
+ db, local_abspath, scratch_pool,
+ scratch_pool));
+
if (!conflicted)
return SVN_NO_ERROR;
Modified: subversion/trunk/subversion/svn/status.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/status.c?rev=1095838&r1=1095837&r2=1095838&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/status.c (original)
+++ subversion/trunk/subversion/svn/status.c Thu Apr 21 22:37:34 2011
@@ -153,13 +153,18 @@ print_status(const char *path,
svn_boolean_t tree_conflicted;
svn_error_t *err;
- err = svn_wc_conflicted_p3(&prop_conflicted,
- &text_conflicted,
+ err = svn_wc_conflicted_p3(&text_conflicted,
+ &prop_conflicted,
&tree_conflicted, ctx->wc_ctx,
local_abspath, pool);
if (err && err->apr_err == SVN_ERR_WC_UPGRADE_REQUIRED)
- svn_error_clear(err);
+ {
+ svn_error_clear(err);
+ text_conflicted = FALSE;
+ prop_conflicted = FALSE;
+ tree_conflicted = FALSE;
+ }
else
SVN_ERR(err);