Date: Mon, 12 Mar 2001 03:12:36 -0800 (PST) From: ggong@cal.alumni.berkeley.edu To: freebsd-gnats-submit@FreeBSD.org Subject: misc/25731: mergemaster -a is not automatic when it finds a file that is missing Message-ID: <200103121112.f2CBCaw97888@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 25731
>Category: misc
>Synopsis: mergemaster -a is not automatic when it finds a file that is missing
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Mon Mar 12 03:20:01 PST 2001
>Closed-Date:
>Last-Modified:
>Originator: Gilbert Gong
>Release: 4.2-STABLE
>Organization:
>Environment:
FreeBSD ggong.baycis.com 4.2-STABLE FreeBSD 4.2-STABLE #0: Fri Mar 2 00:15:19 PST 2001 root@ggong.baycis.com:/usr/src/sys/compile/KERNEL4X i386
>Description:
When mergemaster, running with -a, finds a file which does not exist in the target directory, it queries the user.
>How-To-Repeat:
run mergemaster -a with a file missing from a target directory.
>Fix:
c161 - root@ggong:/usr/src/usr.sbin/mergemaster#diff -u mergemaster.orig.sh mergemaster.sh
--- mergemaster.orig.sh Mon Mar 12 03:01:05 2001
+++ mergemaster.sh Mon Mar 12 03:07:15 2001
@@ -675,8 +675,17 @@
# diff_loop function knows how to handle it.
#
if [ ! -e "${DESTDIR}${COMPFILE#.}" ]; then
- diff_loop
- continue
+ case "${AUTO_RUN}" in
+ '')
+ diff_loop
+ continue
+ ;;
+ *)
+ # If this is an auto run, make it official
+ echo " *** ${COMPFILE} will remain for your consideration"
+ continue
+ ;;
+ esac # Auto run test
fi
case "${STRICT}" in
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200103121112.f2CBCaw97888>