| /sfw/usr/src/cmd/subversion/subversion-1.6.5/contrib/client-side/ |
| svn-resolve | 14 # FileMerge will open a window for each file that is in a conflict
82 local conflict="$1";
85 n=$(ls -1 "${conflict}.merge-${which}.r"* 2>/dev/null | wc -l);
94 ls -1 "${conflict}.merge-left.r"*
98 ls "${conflict}.merge-${which}.r"*
103 local conflict="$1";
105 local revision="$(svn info "${conflict}" | grep '^Revision: ' | sed 's|^Revision: ||')";
107 local left="${conflict}.working";
108 local right="$(find_ancestor "${conflict}" right)";
109 local ancestor="$(find_ancestor "${conflict}" left )"
[all...] |
| /sfw/usr/src/cmd/binutils/binutils-2.19/gas/testsuite/gas/d10v/ |
| warning-015.d | 2 #warning : Warning: resource conflict \(C flag\)
|
| warning-016.d | 2 #warning : Warning: resource conflict \(F flag\)
|
| warning-017.d | 2 #warning : Warning: resource conflict \(C flag\)
|
| warning-018.d | 2 #warning : Warning: resource conflict \(C flag\)
|
| warning-019.d | 2 #warning : Warning: resource conflict \(R0\)
|
| warning-016.s | 1 ;; F flag conflict
|
| warning-017.s | 1 ;; C flag conflict
|
| warning-018.s | 1 ;; C flag conflict
|
| warning-019.s | 1 ;; Dest reg conflict
|
| warning-014.s | 2 ; There is no resource conflict so no warning.
|
| /sfw/usr/src/cmd/conflict/ |
| install-sfw | 41 _install E conflict ${BINDIR}/conflict 555
42 _install M conflict.1 ${MAN1DIR}/conflict.1 444
|
| /sfw/usr/src/cmd/mercurial/mercurial-1.3.1/tests/ |
| test-simplemerge-cmd | 25 cp base conflict-local
26 cp other conflict-other
27 echo not other >> conflict-local
28 echo end >> conflict-local
29 echo end >> conflict-other
30 python simplemerge -p conflict-local base conflict-other || echo "merge failed"
33 python simplemerge -p --no-minimal conflict-local base conflict-other
36 python simplemerge -p -L foo conflict-local base conflict-othe
[all...] |
| /sfw/usr/src/cmd/subversion/subversion-1.6.5/subversion/svn/ |
| tree-conflicts.c | 28 action_str(const svn_wc_conflict_description_t *conflict)
30 switch (conflict->action)
44 reason_str(const svn_wc_conflict_description_t *conflict)
46 switch (conflict->reason)
68 const svn_wc_conflict_description_t *conflict,
72 victim_name = svn_path_basename(conflict->path, pool);
73 reason = reason_str(conflict);
74 action = action_str(conflict);
75 operation = svn_cl__operation_str_human_readable(conflict->operation, pool);
123 const svn_wc_conflict_description_t *conflict,
[all...] |
| tree-conflicts.h | 41 * description of a tree conflict described by @a conflict.
50 const svn_wc_conflict_description_t *conflict,
54 * Append to @a str an XML representation of the tree conflict data
55 * for @a conflict, in a format suitable for 'svn info --xml'.
62 const svn_wc_conflict_description_t *conflict,
|
| /sfw/usr/src/cmd/conflict/conflict-20040901/ |
| run_test.sh | 3 # Run a test to show that CONFLICT is working
5 PROG=$BIN/conflict
11 ** This produces no conflict (unless /bin contains conflict!):
18 ** This shows conflict between different filetypes
20 $PROG -r -t.c.o. conflict
26 $PROG -p -r -t.c.o. conflict
29 DIR=`mktemp -d ${TMPDIR-/tmp}/conflict.XXXXXX 2>/dev/null`
31 DIR=/tmp/conflict.$$
42 ** producing a conflict with the executabl
[all...] |
| /sfw/usr/src/cmd/subversion/subversion-1.6.5/subversion/libsvn_wc/ |
| util.c | 314 svn_wc_conflict_description_t *conflict;
316 conflict = apr_pcalloc(pool, sizeof(*conflict));
317 conflict->path = path;
318 conflict->node_kind = svn_node_file;
319 conflict->kind = svn_wc_conflict_kind_text;
320 conflict->access = adm_access;
321 conflict->action = svn_wc_conflict_action_edit;
322 conflict->reason = svn_wc_conflict_reason_edited;
323 return conflict;
313 svn_wc_conflict_description_t *conflict; local
332 svn_wc_conflict_description_t *conflict; local
353 svn_wc_conflict_description_t *conflict; local
[all...] |
| /sfw/usr/src/cmd/ntpd/ntp-dev-4.2.5p172/ntpd/ |
| ntpd-opts.h | 119 # warning undefining IPV4 due to option name conflict
123 # warning undefining IPV6 due to option name conflict
127 # warning undefining AUTHREQ due to option name conflict
131 # warning undefining AUTHNOREQ due to option name conflict
135 # warning undefining BCASTSYNC due to option name conflict
139 # warning undefining CONFIGFILE due to option name conflict
143 # warning undefining DEBUG_LEVEL due to option name conflict
147 # warning undefining SET_DEBUG_LEVEL due to option name conflict
151 # warning undefining DRIFTFILE due to option name conflict
155 # warning undefining PANICGATE due to option name conflict
[all...] |
| /sfw/usr/src/cmd/subversion/subversion-1.6.5/subversion/tests/libsvn_wc/ |
| tree-conflict-data-test.c | 2 * tree-conflict-data-test.c -- test the storage of tree conflict data
37 svn_wc_conflict_description_t *conflict; local
42 *msg = "read 1 tree conflict";
47 tree_conflict_data = "((conflict Foo.c file update deleted edited "
61 conflict = APR_ARRAY_IDX(conflicts, 0,
64 if ((conflict->node_kind != exp_conflict->node_kind) ||
65 (conflict->action != exp_conflict->action) ||
66 (conflict->reason != exp_conflict->reason) ||
67 (conflict->operation != exp_conflict->operation) |
201 svn_wc_conflict_description_t *conflict; local
291 svn_wc_conflict_description_t *conflict; local
422 svn_wc_conflict_description_t *conflict; local
[all...] |
| /sfw/usr/src/cmd/conflict/conflict-20040901/win32/ |
| conflict.mak | 7 CFG=conflict - Win32 Debug
8 !MESSAGE No configuration specified. Defaulting to conflict - Win32 Debug.
11 !IF "$(CFG)" != "conflict - Win32 Release" && "$(CFG)" !=\
12 "conflict - Win32 Debug"
17 !MESSAGE NMAKE /f "conflict.mak" CFG="conflict - Win32 Debug"
21 !MESSAGE "conflict - Win32 Release" (based on\
23 !MESSAGE "conflict - Win32 Debug" (based on "Win32 (x86) Console Application")
38 !IF "$(CFG)" == "conflict - Win32 Release"
53 ALL : "$(OUTDIR)\conflict.exe"
[all...] |
| /sfw/usr/src/cmd/ntpd/ntp-dev-4.2.5p172/util/ |
| ntp-keygen-opts.h | 110 # warning undefining CERTIFICATE due to option name conflict
114 # warning undefining DEBUG_LEVEL due to option name conflict
118 # warning undefining SET_DEBUG_LEVEL due to option name conflict
122 # warning undefining ID_KEY due to option name conflict
126 # warning undefining GQ_PARAMS due to option name conflict
130 # warning undefining HOST_KEY due to option name conflict
134 # warning undefining IFFKEY due to option name conflict
138 # warning undefining ISSUER_NAME due to option name conflict
142 # warning undefining MD5KEY due to option name conflict
146 # warning undefining MODULUS due to option name conflict
[all...] |
| /sfw/usr/src/lib/drools/drools-core/src/main/java/org/drools/conflict/ |
| AbstractConflictResolver.java | 1 package org.drools.conflict;
|
| FifoConflictResolver.java | 1 package org.drools.conflict;
|
| LifoConflictResolver.java | 1 package org.drools.conflict;
|
| /sfw/usr/src/pkgdefs/SUNWconflict/ |
| prototype_com | 49 f none usr/bin/conflict 555 root bin
54 f none usr/share/man/man1/conflict.1 444 root bin
|
