FreeBSD/contrib/subversion/subversion/libsvn_wc/wc_db_update_move.c
/* Return *WORK_ITEMS to create a conflict on LOCAL_ABSPATH. */
Return *WORK_ITEMS to create a conflict on LOCAL_ABSPATH.
Return * WORK_ITEMS to create a conflict on LOCAL_ABSPATH .
static svn_error_t *
create_conflict_markers(svn_skel_t **work_items,
                        const char *local_abspath,
                        svn_wc__db_t *db,
                        const char *repos_relpath,
                        svn_skel_t *conflict_skel,
                        svn_wc_operation_t operation,
                        const working_node_version_t *old_version,
                        const working_node_version_t *new_version,
                        svn_node_kind_t kind,
                        svn_boolean_t set_operation,
                        apr_pool_t *result_pool,
                        apr_pool_t *scratch_pool)
{
  svn_wc_conflict_version_t *original_version;
  svn_wc_conflict_version_t *conflicted_version;
  const char *part;
  original_version = svn_wc_conflict_version_dup(
                       old_version->location_and_kind, scratch_pool);
  original_version->node_kind = kind;
  conflicted_version = svn_wc_conflict_version_dup(
                         new_version->location_and_kind, scratch_pool);
  conflicted_version->node_kind = kind;
  part = svn_relpath_skip_ancestor(original_version->path_in_repos,
                                   repos_relpath);
  conflicted_version->path_in_repos
    = svn_relpath_join(conflicted_version->path_in_repos, part, scratch_pool);
  original_version->path_in_repos = repos_relpath;
  if (set_operation)
    {
      if (operation == svn_wc_operation_update)
        {
          SVN_ERR(svn_wc__conflict_skel_set_op_update(
                    conflict_skel, original_version,
                    conflicted_version,
                    scratch_pool, scratch_pool));
        }
      else
        {
          SVN_ERR(svn_wc__conflict_skel_set_op_switch(
                    conflict_skel, original_version,
                    conflicted_version,
                    scratch_pool, scratch_pool));
        }
    }
  SVN_ERR(svn_wc__conflict_create_markers(work_items, db,
                                          local_abspath,
                                          conflict_skel,
                                          result_pool,
                                          scratch_pool));
  return SVN_NO_ERROR;
}
static svn_error_t * create_conflict_markers ( svn_skel_t * * work_items , const char * local_abspath , svn_wc__db_t * db , const char * repos_relpath , svn_skel_t * conflict_skel , svn_wc_operation_t operation , const working_node_version_t * old_version , const working_node_version_t * new_version , svn_node_kind_t kind , svn_boolean_t set_operation , apr_pool_t * result_pool , apr_pool_t * scratch_pool ) { svn_wc_conflict_version_t * original_version ; svn_wc_conflict_version_t * conflicted_version ; const char * part ; original_version = svn_wc_conflict_version_dup ( old_version -> location_and_kind , scratch_pool ) ; original_version -> node_kind = kind ; conflicted_version = svn_wc_conflict_version_dup ( new_version -> location_and_kind , scratch_pool ) ; conflicted_version -> node_kind = kind ; part = svn_relpath_skip_ancestor ( original_version -> path_in_repos , repos_relpath ) ; conflicted_version -> path_in_repos = svn_relpath_join ( conflicted_version -> path_in_repos , part , scratch_pool ) ; original_version -> path_in_repos = repos_relpath ; if ( set_operation ) { if ( operation == svn_wc_operation_update ) { SVN_ERR ( svn_wc__conflict_skel_set_op_update ( conflict_skel , original_version , conflicted_version , scratch_pool , scratch_pool ) ) ; } else { SVN_ERR ( svn_wc__conflict_skel_set_op_switch ( conflict_skel , original_version , conflicted_version , scratch_pool , scratch_pool ) ) ; } } SVN_ERR ( svn_wc__conflict_create_markers ( work_items , db , local_abspath , conflict_skel , result_pool , scratch_pool ) ) ; return SVN_NO_ERROR ; }
Return *WORK_ITEMS to create a conflict on LOCAL_ABSPATH.
Return * WORK_ITEMS to create a conflict on LOCAL_ABSPATH .
/* According to this func's doc string, it is "Currently only used for
   * property conflicts as text conflict markers are just in-wc files." */