From owner-cvs-all Fri Oct 25 1: 0: 7 2002 Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9060A37B404; Fri, 25 Oct 2002 01:00:06 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 34BFA43E7B; Fri, 25 Oct 2002 01:00:05 -0700 (PDT) (envelope-from dougb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9P7xHmV070651; Fri, 25 Oct 2002 00:59:17 -0700 (PDT) (envelope-from dougb@repoman.freebsd.org) Received: (from dougb@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9P7xHW4070650; Fri, 25 Oct 2002 00:59:17 -0700 (PDT) Message-Id: <200210250759.g9P7xHW4070650@repoman.freebsd.org> From: Doug Barton Date: Fri, 25 Oct 2002 00:59:17 -0700 (PDT) To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.sh X-FreeBSD-CVS-Branch: RELENG_4 Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG dougb 2002/10/25 00:59:17 PDT Modified files: (Branch: RELENG_4) usr.sbin/mergemaster mergemaster.sh Log: * Finally bring in the changes from 1.37 that quiet the spurious warnings about deleting TEMPROOT. * Bring in the DESTDIR related fixes from 1.36 * Turn the process of finding a file's modes (via perl) into a function to reduce diffs to the code in RELENG_5. Revision Changes Path 1.6.2.15 +14 -9 src/usr.sbin/mergemaster/mergemaster.sh To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message