Changeset View
Changeset View
Standalone View
Standalone View
usr.sbin/etcupdate/etcupdate.sh
Show First 20 Lines • Show All 843 Lines • ▼ Show 20 Lines | 0) | ||||
post_install_file $1 | post_install_file $1 | ||||
echo " M $1" | echo " M $1" | ||||
;; | ;; | ||||
1) | 1) | ||||
# Conflicts, save a version with conflict markers in | # Conflicts, save a version with conflict markers in | ||||
# the conflicts directory. | # the conflicts directory. | ||||
if [ -z "$dryrun" ]; then | if [ -z "$dryrun" ]; then | ||||
install_dirs $NEWTREE $CONFLICTS $1 | install_dirs $NEWTREE $CONFLICTS $1 | ||||
log "diff3 -m -A ${DESTDIR}$1 ${CONFLICTS}$1" | log "diff3 -m ${DESTDIR}$1 ${CONFLICTS}$1" | ||||
diff3 -m -A -L "yours" -L "original" -L "new" \ | diff3 -m -L "yours" -L "original" -L "new" \ | ||||
${DESTDIR}$1 ${OLDTREE}$1 ${NEWTREE}$1 > \ | ${DESTDIR}$1 ${OLDTREE}$1 ${NEWTREE}$1 > \ | ||||
${CONFLICTS}$1 | ${CONFLICTS}$1 | ||||
fi | fi | ||||
echo " C $1" | echo " C $1" | ||||
;; | ;; | ||||
*) | *) | ||||
panic "merge failed with status $res" | panic "merge failed with status $res" | ||||
;; | ;; | ||||
▲ Show 20 Lines • Show All 1,026 Lines • Show Last 20 Lines |