Lines Matching full:conflicts

48 # with unresolved conflicts after the merge are left in a tree rooted
49 # at WORKDIR/conflicts.
721 	log "cat ${CONFLICTS}$1 > ${DESTDIR}$1"
722 	cat ${CONFLICTS}$1 > ${DESTDIR}$1 2>&3
727 # Generate a conflict file when a "new" file conflicts with an
730 # $1 - pathname of the file that conflicts (relative to DESTDIR)
738 	install_dirs $NEWTREE $CONFLICTS $1
742 ' $DESTDIR/$1 $NEWTREE/$1 > $CONFLICTS/$1
866 # conflicts, the updated file is installed.  If the merge fails, the
867 # merged version with conflict markers is left in the CONFLICTS tree.
879 			# No conflicts, so just redo the merge to the
893 			# Conflicts, save a version with conflict markers in
894 			# the conflicts directory.
896 				install_dirs $NEWTREE $CONFLICTS $1
897 				log "diff3 -m ${DESTDIR}$1 ${CONFLICTS}$1"
900 				    ${CONFLICTS}$1
916 	egrep -q '^(<{7}|\|{7}|={7}|>{7}) ' $CONFLICTS/$1
922 # resolving conflicts after an update or merge with Perforce or
924 # commands for resolving conflicts with Subversion.
935 		# doesn't contain any conflicts.
945 				diff -u ${DESTDIR}$1 ${CONFLICTS}$1
948 				$EDITOR ${CONFLICTS}$1
965 				rm ${CONFLICTS}$1
975 					echo "File '$1' still has conflicts," \
987 				rm ${CONFLICTS}$1
998 				rm ${CONFLICTS}$1
1435 # Resolve conflicts left from an earlier merge.
1438 	local conflicts
1444 	if ! [ -d $CONFLICTS ]; then
1449 		echo "The current tree is not present to resolve conflicts."
1453 	conflicts=`(cd $CONFLICTS; find . ! -type d) | sed -e 's/^\.//'`
1454 	for file in $conflicts; do
1499 			if [ -e $CONFLICTS/$file ]; then
1500 				if ! rm $CONFLICTS/$file >&3 2>&1; then
1510 # remaining conflicts followed by any warnings from the previous
1519 	if [ -d $CONFLICTS ]; then
1520 		(cd $CONFLICTS; find . ! -type d) | sed -e 's/^\./  C /'
1549 	# XXX: Should existing conflicts be ignored and removed during
1552 	# Trim the conflicts tree.  Whine if there is anything left.
1553 	if [ -e $CONFLICTS ]; then
1554 		find -d $CONFLICTS -type d -empty -delete >&3 2>&1
1555 		rmdir $CONFLICTS >&3 2>&1
1557 	if [ -d $CONFLICTS ]; then
1558 		echo "Conflicts remain from previous update, aborting."
1611 	# Initialize conflicts and warnings handling.
1613 	mkdir -p $CONFLICTS
1889 # The path of the "conflicts" tree where files with merge conflicts are saved.
1890 CONFLICTS=$WORKDIR/conflicts
1895 # Use $EDITOR for resolving conflicts.  If it is not set, default to vi.