Home
last modified time | relevance | path

Searched refs:conflict_new (Results 1 – 25 of 80) sorted by relevance

1234

/dports/java/java-subversion/subversion-1.14.1/subversion/libsvn_wc/
H A Dwc-metadata.sql147 conflict_new TEXT, field
647 conflict_old, conflict_working, conflict_new, prop_reject, tree_conflict_data
651 OR conflict_new IS NOT NULL
658 conflict_working = NULL, conflict_new = NULL, prop_reject = NULL,
729 conflict_new TEXT, field
738 conflict_new, conflict_working, prop_reject, changelist, text_mod
749 conflict_new TEXT, field
763 conflict_new, conflict_working, prop_reject, changelist, text_mod
H A Dentries.c90 const char *conflict_new; member
971 entry->conflict_new = svn_dirent_basename(their_abspath, in read_one_entry()
1642 actual_node->conflict_new, in insert_actual_node()
1972 if (parent_relpath && entry->conflict_new) in write_entry()
1973 actual_node->conflict_new = svn_relpath_join(parent_relpath, in write_entry()
1974 entry->conflict_new, in write_entry()
1977 actual_node->conflict_new = entry->conflict_new; in write_entry()
2599 if (entry->conflict_new) in svn_wc_entry_dup()
2600 dupentry->conflict_new = apr_pstrdup(pool, entry->conflict_new); in svn_wc_entry_dup()
H A Dupgrade.c1156 const char *conflict_new, in svn_wc__upgrade_conflict_skel_from_raw() argument
1169 if (conflict_old || conflict_new || conflict_wrk) in svn_wc__upgrade_conflict_skel_from_raw()
1181 if (conflict_new) in svn_wc__upgrade_conflict_skel_from_raw()
1182 new_abspath = svn_dirent_join(wcroot_abspath, conflict_new, in svn_wc__upgrade_conflict_skel_from_raw()
1296 const char *conflict_new = svn_sqlite__column_text(stmt, 4, NULL); in bump_30_upgrade_one_conflict() local
1307 conflict_new, in bump_30_upgrade_one_conflict()
H A Dwc.h607 const char *conflict_new,
/dports/devel/py-subversion/subversion-1.14.1/subversion/libsvn_wc/
H A Dwc-metadata.sql147 conflict_new TEXT, field
647 conflict_old, conflict_working, conflict_new, prop_reject, tree_conflict_data
651 OR conflict_new IS NOT NULL
658 conflict_working = NULL, conflict_new = NULL, prop_reject = NULL,
729 conflict_new TEXT, field
738 conflict_new, conflict_working, prop_reject, changelist, text_mod
749 conflict_new TEXT, field
763 conflict_new, conflict_working, prop_reject, changelist, text_mod
H A Dentries.c90 const char *conflict_new; member
971 entry->conflict_new = svn_dirent_basename(their_abspath, in read_one_entry()
1642 actual_node->conflict_new, in insert_actual_node()
1972 if (parent_relpath && entry->conflict_new) in write_entry()
1973 actual_node->conflict_new = svn_relpath_join(parent_relpath, in write_entry()
1974 entry->conflict_new, in write_entry()
1977 actual_node->conflict_new = entry->conflict_new; in write_entry()
2599 if (entry->conflict_new) in svn_wc_entry_dup()
2600 dupentry->conflict_new = apr_pstrdup(pool, entry->conflict_new); in svn_wc_entry_dup()
H A Dupgrade.c1156 const char *conflict_new, in svn_wc__upgrade_conflict_skel_from_raw() argument
1169 if (conflict_old || conflict_new || conflict_wrk) in svn_wc__upgrade_conflict_skel_from_raw()
1181 if (conflict_new) in svn_wc__upgrade_conflict_skel_from_raw()
1182 new_abspath = svn_dirent_join(wcroot_abspath, conflict_new, in svn_wc__upgrade_conflict_skel_from_raw()
1296 const char *conflict_new = svn_sqlite__column_text(stmt, 4, NULL); in bump_30_upgrade_one_conflict() local
1307 conflict_new, in bump_30_upgrade_one_conflict()
H A Dwc.h607 const char *conflict_new,
/dports/security/subversion-gnome-keyring/subversion-1.14.1/subversion/libsvn_wc/
H A Dwc-metadata.sql147 conflict_new TEXT, field
647 conflict_old, conflict_working, conflict_new, prop_reject, tree_conflict_data
651 OR conflict_new IS NOT NULL
658 conflict_working = NULL, conflict_new = NULL, prop_reject = NULL,
729 conflict_new TEXT, field
738 conflict_new, conflict_working, prop_reject, changelist, text_mod
749 conflict_new TEXT, field
763 conflict_new, conflict_working, prop_reject, changelist, text_mod
H A Dentries.c90 const char *conflict_new; member
971 entry->conflict_new = svn_dirent_basename(their_abspath, in read_one_entry()
1642 actual_node->conflict_new, in insert_actual_node()
1972 if (parent_relpath && entry->conflict_new) in write_entry()
1973 actual_node->conflict_new = svn_relpath_join(parent_relpath, in write_entry()
1974 entry->conflict_new, in write_entry()
1977 actual_node->conflict_new = entry->conflict_new; in write_entry()
2599 if (entry->conflict_new) in svn_wc_entry_dup()
2600 dupentry->conflict_new = apr_pstrdup(pool, entry->conflict_new); in svn_wc_entry_dup()
H A Dupgrade.c1156 const char *conflict_new, in svn_wc__upgrade_conflict_skel_from_raw() argument
1169 if (conflict_old || conflict_new || conflict_wrk) in svn_wc__upgrade_conflict_skel_from_raw()
1181 if (conflict_new) in svn_wc__upgrade_conflict_skel_from_raw()
1182 new_abspath = svn_dirent_join(wcroot_abspath, conflict_new, in svn_wc__upgrade_conflict_skel_from_raw()
1296 const char *conflict_new = svn_sqlite__column_text(stmt, 4, NULL); in bump_30_upgrade_one_conflict() local
1307 conflict_new, in bump_30_upgrade_one_conflict()
H A Dwc.h607 const char *conflict_new,
/dports/devel/p5-subversion/subversion-1.14.1/subversion/libsvn_wc/
H A Dwc-metadata.sql147 conflict_new TEXT, field
647 conflict_old, conflict_working, conflict_new, prop_reject, tree_conflict_data
651 OR conflict_new IS NOT NULL
658 conflict_working = NULL, conflict_new = NULL, prop_reject = NULL,
729 conflict_new TEXT, field
738 conflict_new, conflict_working, prop_reject, changelist, text_mod
749 conflict_new TEXT, field
763 conflict_new, conflict_working, prop_reject, changelist, text_mod
H A Dentries.c90 const char *conflict_new; member
971 entry->conflict_new = svn_dirent_basename(their_abspath, in read_one_entry()
1642 actual_node->conflict_new, in insert_actual_node()
1972 if (parent_relpath && entry->conflict_new) in write_entry()
1973 actual_node->conflict_new = svn_relpath_join(parent_relpath, in write_entry()
1974 entry->conflict_new, in write_entry()
1977 actual_node->conflict_new = entry->conflict_new; in write_entry()
2599 if (entry->conflict_new) in svn_wc_entry_dup()
2600 dupentry->conflict_new = apr_pstrdup(pool, entry->conflict_new); in svn_wc_entry_dup()
H A Dupgrade.c1156 const char *conflict_new, in svn_wc__upgrade_conflict_skel_from_raw() argument
1169 if (conflict_old || conflict_new || conflict_wrk) in svn_wc__upgrade_conflict_skel_from_raw()
1181 if (conflict_new) in svn_wc__upgrade_conflict_skel_from_raw()
1182 new_abspath = svn_dirent_join(wcroot_abspath, conflict_new, in svn_wc__upgrade_conflict_skel_from_raw()
1296 const char *conflict_new = svn_sqlite__column_text(stmt, 4, NULL); in bump_30_upgrade_one_conflict() local
1307 conflict_new, in bump_30_upgrade_one_conflict()
H A Dwc.h607 const char *conflict_new,
/dports/devel/kdevelop/kdevelop-21.12.3/plugins/subversion/3rdparty/kdevsvncpp/
H A Dentry.hpp201 return m_entry->conflict_new; in conflictNew()
H A Dinfo.cpp230 return m->info->conflict_new; in newConflictFile()
/dports/java/java-subversion/subversion-1.14.1/tools/examples/
H A DSvnCLBrowse135 if info.conflict_new:
136 window.AppendText("Conflict Current Base File: %s\n" % info.conflict_new)
/dports/security/subversion-gnome-keyring/subversion-1.14.1/tools/examples/
H A DSvnCLBrowse135 if info.conflict_new:
136 window.AppendText("Conflict Current Base File: %s\n" % info.conflict_new)
/dports/devel/py-subversion/subversion-1.14.1/tools/examples/
H A DSvnCLBrowse135 if info.conflict_new:
136 window.AppendText("Conflict Current Base File: %s\n" % info.conflict_new)
/dports/devel/p5-subversion/subversion-1.14.1/tools/examples/
H A DSvnCLBrowse135 if info.conflict_new:
136 window.AppendText("Conflict Current Base File: %s\n" % info.conflict_new)
/dports/sysutils/pacman/pacman-5.1.3/lib/libalpm/
H A Dconflict.c46 static alpm_conflict_t *conflict_new(alpm_pkg_t *pkg1, alpm_pkg_t *pkg2, in conflict_new() function
136 alpm_conflict_t *conflict = conflict_new(pkg1, pkg2, reason); in add_conflict()
/dports/java/java-subversion/subversion-1.14.1/subversion/tests/cmdline/
H A Dentries-dump.c198 str_value("conflict_new", entry->conflict_new, iterpool); in entries_dump()
/dports/devel/py-subversion/subversion-1.14.1/subversion/tests/cmdline/
H A Dentries-dump.c198 str_value("conflict_new", entry->conflict_new, iterpool); in entries_dump()

1234