Searched refs:conflict (Results 51 - 75 of 113) sorted by relevance

12345

/freebsd-11-stable/contrib/subversion/subversion/svn/
H A Dshelf-cmd.c584 /* Throw an error if any path affected by SHELF_VERSION gives a conflict
599 svn_boolean_t conflict; local
601 SVN_ERR(svn_client__shelf_test_apply_file(&conflict, shelf_version, path,
603 if (conflict)
628 * Error if any path would have a conflict, unless @a force_if_conflict.
675 "path would conflict with a local modification "
H A Dshelf2-cmd.c584 /* Throw an error if any path affected by SHELF_VERSION gives a conflict
599 svn_boolean_t conflict; local
601 SVN_ERR(svn_client__shelf2_test_apply_file(&conflict, shelf_version, path,
603 if (conflict)
628 * Error if any path would have a conflict, unless @a force_if_conflict.
675 "path would conflict with a local modification "
H A Dcl.h64 /* Resolve the conflict with the pre-conflict base file. */
67 /* Resolve the conflict with the current working file. */
71 from the pre-conflict working copy file. */
75 from the post-conflict base copy file. */
78 /* Resolve the conflict by taking the entire pre-conflict working
82 /* Resolve the conflict by taking the entire post-conflict base file. */
85 /* Launch user's editor and resolve conflict wit
[all...]
/freebsd-11-stable/contrib/ncurses/progs/
H A Dtic.c1945 bool conflict = FALSE; local
1972 if (!conflict) {
1974 conflict = TRUE;
/freebsd-11-stable/gnu/usr.bin/cc/cc_int/
H A DMakefile41 cfgrtl.o combine.o conflict.o convert.o coverage.o cse.o cselib.o \
/freebsd-11-stable/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lua/
H A Dlparser.c1110 int conflict = 0; local
1115 conflict = 1;
1121 conflict = 1;
1126 if (conflict) {
/freebsd-11-stable/contrib/lua/src/
H A Dlparser.c1122 int conflict = 0; local
1127 conflict = 1;
1133 conflict = 1;
1138 if (conflict) {
/freebsd-11-stable/contrib/subversion/subversion/libsvn_client/
H A Dshelf2.c1006 /* Catch any conflict, even a tree conflict on a path that has
1407 are used to tag onto a file name in case of a merge conflict */
1422 NULL, NULL, /*left, right conflict-versions*/
1452 NULL, NULL, /*left, right conflict-versions*/
1509 svn_boolean_t test_only; /* only check whether it would conflict */
1510 svn_boolean_t conflict; /* would it conflict? */ member in struct:apply_files_baton_t
1520 * In test mode (BATON->test_only): set BATON->conflict if we can't apply
1521 * the change to WC at RELPATH without conflict
[all...]
H A Ddeprecated.c2840 /* Populate conflict fields. */
2847 const svn_wc_conflict_description2_t *conflict
2853 switch (conflict->kind)
2856 info->tree_conflict = svn_wc__cd2_to_cd(conflict, pool);
2860 info->conflict_old = conflict->base_abspath;
2861 info->conflict_new = conflict->my_abspath;
2862 info->conflict_wrk = conflict->their_abspath;
2866 info->prejfile = conflict->their_abspath;
2845 const svn_wc_conflict_description2_t *conflict local
/freebsd-11-stable/share/mk/
H A Dmeta.stage.mk65 # a staging conflict should cause an error
/freebsd-11-stable/contrib/subversion/subversion/libsvn_repos/
H A Dcommit.c809 const char *conflict;
820 err = svn_repos_fs_commit_txn(&conflict, eb->repos,
826 exist and we can't use txn_root for conflict resolution etc.
851 /* ### todo: we should check whether it really was a conflict,
852 and return the conflict info if so? */
854 /* If the commit failed, it's *probably* due to a conflict --
1308 /* Did a conflict occur during the commit process? */
1314 conflict was specified... we committed a revision. Run the hooks.
806 const char *conflict; local
/freebsd-11-stable/contrib/subversion/subversion/libsvn_fs_fs/
H A Dtree.c1747 SVN_ERR_FS_CONFLICT error that indicates that there was a conflict
1810 * reporting conflict location.
1817 * If there are differences between ANCESTOR and SOURCE that conflict
1890 * early exit with conflict;
1899 * conflict;
1919 * must be merged or declared to be in conflict.
1922 * double delete; flag a conflict.
1924 * If any of the three entries is of type file, declare a conflict.
1928 * node-id fields), declare a conflict. A replacement is
1938 * If NAME exists in TARGET, declare a conflict
2191 merge_changes(dag_node_t *ancestor_node, dag_node_t *source_node, svn_fs_txn_t *txn, svn_stringbuf_t *conflict, apr_pool_t *pool) argument
2272 svn_stringbuf_t *conflict = svn_stringbuf_create_empty(pool); local
2389 svn_stringbuf_t *conflict = svn_stringbuf_create_empty(pool); local
[all...]
/freebsd-11-stable/contrib/subversion/
H A Dbuild.conf1226 description = Test libsvn_client conflict resolver
1280 [conflict-data-test]
1281 description = Test the storage of tree conflict data
1284 sources = conflict-data-test.c utils.c
1595 conflict-data-test db-test pristine-store-test entries-compat-test
/freebsd-11-stable/contrib/gcclibs/libmudflap/
H A Dconfigure3806 which can conflict with char $ac_func (); below.
3912 which can conflict with char $ac_func (); below.
4017 which can conflict with char $ac_func (); below.
4123 which can conflict with char $ac_func (); below.
4227 which can conflict with char $ac_func (); below.
4336 which can conflict with char $ac_func (); below.
4442 which can conflict with char $ac_func (); below.
4548 which can conflict with char $ac_func (); below.
4652 which can conflict with char $ac_func (); below.
4756 which can conflict wit
[all...]
/freebsd-11-stable/contrib/bmake/mk/
H A Dmeta.stage.mk66 # a staging conflict should cause an error
/freebsd-11-stable/contrib/subversion/subversion/libsvn_fs_base/
H A Dtree.c2076 SVN_ERR_FS_CONFLICT error that indicates that there was a conflict
2092 * filesystem, and is used for reporting conflict location.
2099 * If there are differences between ANCESTOR and SOURCE that conflict
2174 * early exit with conflict;
2183 * conflict;
2203 * must be merged or declared to be in conflict.
2206 * double delete; flag a conflict.
2208 * If any of the three entries is of type file, declare a conflict.
2212 * node-id fields), declare a conflict. A replacement is
2222 * If NAME exists in TARGET, declare a conflict
2481 svn_stringbuf_t *conflict; member in struct:merge_args
[all...]
/freebsd-11-stable/contrib/libreadline/
H A Dconfigure4332 which can conflict with char $ac_func (); below.
4443 which can conflict with char $ac_func (); below.
4546 which can conflict with char $ac_func (); below.
4650 which can conflict with char $ac_func (); below.
6465 which can conflict with char tgetent (); below.
7326 which can conflict with char mbsrtowcs (); below.
7423 which can conflict with char mbrlen (); below.
7521 which can conflict with char wcrtomb (); below.
7618 which can conflict with char wcscoll (); below.
7715 which can conflict wit
[all...]
/freebsd-11-stable/contrib/subversion/subversion/libsvn_wc/
H A Dupdate_editor.c80 * if target is already in conflict or obstructed:
83 * if this action will cause a tree conflict:
84 * record the tree conflict
93 * 1. if # Incoming change is inside an item already in conflict:
97 * notify "skipped because already in conflict" just once
100 * if # Incoming change affects an item already in conflict:
107 * notify "skipped because already in conflict"
116 * 3. if # Incoming change raises a tree conflict:
122 * notify "tree conflict"
138 * [*2] Details of which combinations of property and text changes conflict
820 complete_conflict(svn_skel_t *conflict, const struct edit_baton *eb, const char *local_abspath, const char *old_repos_relpath, svn_revnum_t old_revision, const char *new_repos_relpath, svn_node_kind_t local_kind, svn_node_kind_t target_kind, const svn_skel_t *delete_conflict, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
[all...]
H A Dwc-checks.sql108 Only conflict data is valid if there is none */
/freebsd-11-stable/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/
H A Ddmu.h921 int maxlen, boolean_t *conflict);
/freebsd-11-stable/usr.sbin/etcupdate/
H A Detcupdate.sh60 # - automatable conflict resolution
665 # there (it caused a conflict). However, it doesn't hurt to
677 # Generate a conflict file when a "new" file conflicts with an
767 # conflict manually.
817 # merged version with conflict markers is left in the CONFLICTS tree.
824 # Try the merge to see if there is a conflict.
843 # Conflicts, save a version with conflict markers in
860 # Returns true if a file contains conflict markers from a merge conflict.
869 # Attempt to resolve a conflict
[all...]
/freebsd-11-stable/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/
H A Ddmu_objset.c1891 boolean_t *conflict)
1901 MT_NORMALIZE, real, maxlen, conflict));
1890 dmu_snapshot_realname(objset_t *os, char *name, char *real, int maxlen, boolean_t *conflict) argument
/freebsd-11-stable/contrib/subversion/subversion/include/
H A Dsvn_wc.h1109 /** The path is a tree-conflict victim of the intended action (*not*
1110 * a persistent tree-conflict from an earlier operation, but *this*
1111 * operation caused the tree-conflict). @since New in 1.6. */
1204 /** Operation failed because the node remains in conflict
1241 * This can be used by clients to detect when to display conflict summary
1247 * This can be used by clients to detect when to display conflict summary
1288 /** A property conflict on a path was marked as resolved.
1293 /** A tree conflict on a path was marked as resolved.
1297 /** Starting to search the repository for details about a tree conflict.
1301 /** Progressing in search of repository for details about a tree conflict
[all...]
/freebsd-11-stable/contrib/ncurses/
H A Dconfigure1385 # non-vendor systems don't have a conflict
5021 which can conflict with char dlsym (); below. */
6903 which can conflict with char $ac_func (); below. */
6976 which can conflict with char $ac_func (); below. */
8770 which can conflict with char $ac_func (); below. */
11881 which can conflict with char pthread_kill (); below. */
12855 which can conflict with char $ac_func (); below. */
13651 which can conflict with char gettimeofday (); below. */
14191 which can conflict with char regcomp (); below. */
14317 which can conflict wit
[all...]
/freebsd-11-stable/contrib/gcclibs/libiberty/
H A Dconfigure5069 which can conflict with char $ac_func (); below.
6274 which can conflict with char $ac_func (); below.
6413 which can conflict with char $ac_func (); below.
6635 which can conflict with char $ac_func (); below.
6981 which can conflict with char $ac_func (); below.
7093 which can conflict with char $ac_func (); below.
7326 which can conflict with char $ac_func (); below.
8492 which can conflict with char $ac_func (); below.

Completed in 407 milliseconds

12345