> URL: http://svn.apache.org/viewvc?rev=1432014&view=rev
> Log:
> Put more complete information in some of the conflicts raised when
> following a move.
[...]
Hi Philip. Looks good ...
> Modified: subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
> ==============================================================================
> --- subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c (original)
> +++ subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c> @@ -116,13
> +117,10 @@ struct tc_editor_baton > -/* If LOCAL_RELPATH is shadowed then
> raise a tree-conflict on the root
> - of the obstruction if such a tree-conflict does not already exist.
> -
> - KIND is the node kind of ... ### what?
> -
> - Set *IS_CONFLICTED ... ### if/iff what?
> - */
> +/* If LOCAL_RELPATH is shadowed then set *IS_CONFLICTED to TRUE and
> + raise a tree-conflict on the root of the obstruction if such a
> + tree-conflict does not already exist. KIND is the kind of the
> + incoming LOCAL_RELPATH. */
... and thanks for completing the doc string ...
> static svn_error_t *
> check_tree_conflict(svn_boolean_t *is_conflicted,
> struct tc_editor_baton *b,
> @@ -145,7 +144,11 @@ check_tree_conflict(svn_boolean_t *is_co
> dst_op_depth));
> SVN_ERR(svn_sqlite__step(&have_row, stmt));
> if (have_row)
> - op_depth = svn_sqlite__column_int(stmt, 0);
> + {
> + op_depth = svn_sqlite__column_int(stmt, 0);
> + old_kind = svn__node_kind_from_kind(svn_sqlite__column_token(stmt, 2,
> +
> kind_map));
Can we factor out this direct DB querying code and give it a descriptive name?
Does
svn_wc__db_depth_get_info()
not do what you need?
- Julian
> + }
> SVN_ERR(svn_sqlite__reset(stmt));
>
> if (!have_row)
