subversion/libsvn_wc/merge.c

162                     const merge_target_t *mt,
178       = svn_prop_get_value(mt->old_actual_props, SVN_PROP_MIME_TYPE);
179     const svn_prop_t *prop = get_prop(mt->prop_diff, SVN_PROP_MIME_TYPE);
192                                          mt->db, mt->local_abspath,
193                                          mt->old_actual_props, TRUE,
207                                          mt->db, mt->local_abspath,
208                                          mt->old_actual_props, TRUE,
219                                          mt->db, mt->local_abspath,
220                                          mt->old_actual_props, TRUE,
234           if ((prop = get_prop(mt->prop_diff, SVN_PROP_EOL_STYLE)) && prop->value)
260       SVN_ERR(svn_wc__db_temp_wcroot_tempdir(&temp_dir_abspath, mt->db,
261                                              mt->wri_abspath,
492                          const merge_target_t *mt,
511   svn_dirent_split(&dir_abspath, &target_name, mt->local_abspath,
514   SVN_ERR(svn_wc__db_get_wcroot(&wcroot_abspath, mt->db, mt->wri_abspath,
516   SVN_ERR(svn_wc__db_temp_wcroot_tempdir(&temp_dir_abspath, mt->db,
517                                          mt->wri_abspath,
548       SVN_ERR(svn_wc__wq_build_file_remove(&work_item, mt->db, wcroot_abspath,
565       SVN_ERR(svn_wc__wq_build_file_remove(&work_item, mt->db, wcroot_abspath,
590                                                 mt->db, mt->local_abspath,
596                                                 mt->db, mt->local_abspath,
603   SVN_ERR(detranslate_wc_file(&detranslated_target_copy, mt, TRUE,
604                               mt->local_abspath,
609                                                 mt->db, mt->local_abspath,
616   SVN_ERR(svn_wc__wq_build_file_remove(&work_item, mt->db, wcroot_abspath,
820                 const merge_target_t *mt,
843   base_name = svn_dirent_basename(mt->local_abspath, scratch_pool);
849   SVN_ERR(svn_wc__db_temp_wcroot_tempdir(&temp_dir, mt->db, mt->wri_abspath,
856   if (mt->diff3_cmd)
859                                      mt->diff3_cmd,
860                                      mt->merge_options,
871                           mt->merge_options,
896                     mt, left_abspath, right_abspath,
909                                                           mt->db, mt->local_abspath,
926                                          &special, mt->db, mt->local_abspath,
927                                          mt->old_actual_props, TRUE,
932                                               mt->local_abspath),
942                                             mt->db, mt->local_abspath,
951   SVN_ERR(svn_wc__wq_build_file_remove(&work_item, mt->db, mt->local_abspath,
990                   const merge_target_t *mt,
1010   svn_dirent_split(&merge_dirpath, &merge_filename, mt->local_abspath, pool);
1040   if (strcmp(mt->local_abspath, detranslated_target_abspath) != 0)
1050       SVN_ERR(svn_wc__wq_build_file_move(work_items, mt->db,
1051                                          mt->local_abspath,
1067                                                   mt->db, mt->local_abspath,
1104   merge_target_t mt;
1113   mt.db = db;
1114   mt.local_abspath = target_abspath;
1115   mt.wri_abspath = wri_abspath;
1116   mt.old_actual_props = old_actual_props;
1117   mt.prop_diff = prop_diff;
1118   mt.diff3_cmd = diff3_cmd;
1119   mt.merge_options = merge_options;
1127       const char *value = svn_prop_get_value(mt.old_actual_props,
1133   SVN_ERR(detranslate_wc_file(&detranslated_target_abspath, &mt,
1162                                     &mt,
1177                                   &mt,