Searched refs:conflicts (Results 1 - 15 of 15) sorted by relevance

/freebsd-current/usr.bin/getconf/
H A DMakefile14 .PHONY: conflicts
16 all: conflicts
26 conflicts: conflicting.names unique.names
28 echo "Name conflicts found!" >&2; \
/freebsd-current/contrib/byacc/
H A Doutput.c19 static Value_t *conflicts = NULL; variable
425 if (conflicts[i + j] != conflicts[cbase + j])
475 conflicts[nconflicts++] = -1;
484 if (conflicts[cbase] == -1)
511 conflicts[nconflicts++] = p->number;
520 conflicts[nconflicts++] = -1;
522 conflicts[nconflicts++] = (Value_t)(p->number - 2);
531 conflicts[nconflicts++] = -1;
540 if (conflicts[cbas
[all...]
/freebsd-current/contrib/byacc/test/
H A Drun_make.sh114 bison -Wno-other -Wno-conflicts-sr -Wconflicts-rr -y -Wno-yacc run_make.y
/freebsd-current/contrib/ntp/ntpd/
H A Dntp_filegen.c218 static u_long conflicts = 0; local
234 (int)getpid(), conflicts++);
/freebsd-current/usr.sbin/etcupdate/
H A Detcupdate.sh48 # with unresolved conflicts after the merge are left in a tree rooted
49 # at WORKDIR/conflicts.
727 # Generate a conflict file when a "new" file conflicts with an
730 # $1 - pathname of the file that conflicts (relative to DESTDIR)
866 # conflicts, the updated file is installed. If the merge fails, the
879 # No conflicts, so just redo the merge to the
894 # the conflicts directory.
922 # resolving conflicts after an update or merge with Perforce or
924 # commands for resolving conflicts with Subversion.
935 # doesn't contain any conflicts
[all...]
/freebsd-current/usr.sbin/etcupdate/tests/
H A Dpreworld_test.sh61 CONFLICTS=$WORKDIR/conflicts
H A Dconflicts_test.sh36 echo "Usage: conflicts.sh [-s script] [-w workdir]"
61 CONFLICTS=$WORKDIR/conflicts
66 # These tests deal with conflicts to a single file. For each test, we
H A Dignore_test.sh61 CONFLICTS=$WORKDIR/conflicts
H A Dtzsetup_test.sh61 CONFLICTS=$WORKDIR/conflicts
H A Dfbsdid_test.sh61 CONFLICTS=$WORKDIR/conflicts
80 # These tests deal with FreeBSD ID string conflicts. We run the test
H A Dalways_test.sh61 CONFLICTS=$WORKDIR/conflicts
109 # /second/second/difftype: Newly added file conflicts with
115 # /second/second/difflinks: Newly added link conflicts with
120 # /second/second/difffiles: Newly added file conflicts with
509 # most of the warnings and conflicts.
H A Dtests_test.sh61 CONFLICTS=$WORKDIR/conflicts
83 # as a file merge that results in conflicts versus one that
228 # /second/second/difftype: Newly added file conflicts with
234 # /second/second/difflinks: Newly added link conflicts with
239 # /second/second/difffiles: Newly added file conflicts with
514 # file without conflicts where the test tree already has the
603 # - Verify that a merge without conflicts to /etc/mail/aliases
/freebsd-current/contrib/bmake/unit-tests/
H A Dvar-scope-cmdline.mk13 # most of the variables are stored. This conflicts with the statement that
/freebsd-current/contrib/ncurses/
H A Ddist.mk97 # If that conflicts with the --without-manpage-renames, you can install those
/freebsd-current/usr.sbin/freebsd-update/
H A Dfreebsd-update.sh2596 Press Enter to edit this file in ${EDITOR} and resolve the conflicts
2955 # Check for and remove an existing directory that conflicts with the file or

Completed in 144 milliseconds