FreeBSD/contrib/subversion/subversion/libsvn_wc/wc_db_update_move.c
/* Set a tree conflict for the shadowed node LOCAL_RELPATH, which is
   the ROOT OF THE OBSTRUCTION if such a tree-conflict does not
   already exist.  KIND is the kind of the incoming LOCAL_RELPATH. */
Set a tree conflict for the shadowed node LOCAL_RELPATH, which is
the ROOT OF THE OBSTRUCTION if such a tree-conflict does not
already exist.  KIND is the kind of the incoming LOCAL_RELPATH.
Set a tree conflict for the shadowed node LOCAL_RELPATH which is the ROOT OF THE OBSTRUCTION if such a tree - conflict does not already exist . KIND is the kind of the incoming LOCAL_RELPATH .
static svn_error_t *
mark_tc_on_op_root(node_move_baton_t *nmb,
                   svn_node_kind_t old_kind,
                   svn_node_kind_t new_kind,
                   svn_wc_conflict_action_t action,
                   apr_pool_t *scratch_pool)
{
  update_move_baton_t *b = nmb->umb;
  const char *move_dst_relpath;
  svn_skel_t *conflict;
  SVN_ERR_ASSERT(nmb->shadowed && !nmb->pb->shadowed);
  nmb->skip = TRUE;
  if (old_kind == svn_node_none)
    move_dst_relpath = NULL;
  else
    SVN_ERR(svn_wc__db_scan_moved_to_internal(NULL, &move_dst_relpath, NULL,
                                              b->wcroot, nmb->dst_relpath,
                                              b->dst_op_depth,
                                              scratch_pool, scratch_pool));
  SVN_ERR(create_node_tree_conflict(&conflict, nmb, nmb->dst_relpath,
                                    old_kind, new_kind,
                                    (move_dst_relpath
                                     ? svn_wc_conflict_reason_moved_away
                                     : svn_wc_conflict_reason_deleted),
                                    action, move_dst_relpath
                                              ? nmb->dst_relpath
                                              : NULL,
                                    scratch_pool, scratch_pool));
  SVN_ERR(update_move_list_add(b->wcroot, nmb->dst_relpath, b->db,
                               svn_wc_notify_tree_conflict,
                               new_kind,
                               svn_wc_notify_state_inapplicable,
                               svn_wc_notify_state_inapplicable,
                               conflict, NULL, scratch_pool));
  return SVN_NO_ERROR;
}
static svn_error_t * mark_tc_on_op_root ( node_move_baton_t * nmb , svn_node_kind_t old_kind , svn_node_kind_t new_kind , svn_wc_conflict_action_t action , apr_pool_t * scratch_pool ) { update_move_baton_t * b = nmb -> umb ; const char * move_dst_relpath ; svn_skel_t * conflict ; SVN_ERR_ASSERT ( nmb -> shadowed && ! nmb -> pb -> shadowed ) ; nmb -> skip = TRUE ; if ( old_kind == svn_node_none ) move_dst_relpath = NULL ; else SVN_ERR ( svn_wc__db_scan_moved_to_internal ( NULL , & move_dst_relpath , NULL , b -> wcroot , nmb -> dst_relpath , b -> dst_op_depth , scratch_pool , scratch_pool ) ) ; SVN_ERR ( create_node_tree_conflict ( & conflict , nmb , nmb -> dst_relpath , old_kind , new_kind , ( move_dst_relpath ? svn_wc_conflict_reason_moved_away : svn_wc_conflict_reason_deleted ) , action , move_dst_relpath ? nmb -> dst_relpath : NULL , scratch_pool , scratch_pool ) ) ; SVN_ERR ( update_move_list_add ( b -> wcroot , nmb -> dst_relpath , b -> db , svn_wc_notify_tree_conflict , new_kind , svn_wc_notify_state_inapplicable , svn_wc_notify_state_inapplicable , conflict , NULL , scratch_pool ) ) ; return SVN_NO_ERROR ; }
Set a tree conflict for the shadowed node LOCAL_RELPATH, which is
the ROOT OF THE OBSTRUCTION if such a tree-conflict does not
already exist.
Set a tree conflict for the shadowed node LOCAL_RELPATH which is the ROOT OF THE OBSTRUCTION if such a tree - conflict does not already exist .