From owner-cvs-all Sun Jun 30 12: 1:39 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 1307537B406; Sun, 30 Jun 2002 12:01:36 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id BA9D543E09; Sun, 30 Jun 2002 12:01:35 -0700 (PDT) (envelope-from dougb@FreeBSD.org) Received: from freefall.freebsd.org (dougb@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5UJ1ZJU012916; Sun, 30 Jun 2002 12:01:35 -0700 (PDT) (envelope-from dougb@freefall.freebsd.org) Received: (from dougb@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5UJ1ZcL012915; Sun, 30 Jun 2002 12:01:35 -0700 (PDT) Message-Id: <200206301901.g5UJ1ZcL012915@freefall.freebsd.org> From: Doug Barton Date: Sun, 30 Jun 2002 12:01:35 -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/06/30 12:01:35 PDT Modified files: (Branch: RELENG_4) usr.sbin/mergemaster mergemaster.sh Log: MFC the "press enter to continue" bit from 1.32, and the handling of chflags from 1.3[45]. At this time I don't plan to import stat(1) into RELENG_4, so the perl -> stat bits are left out for now. The somewhat rapid MFC of the chflags stuff is being done at the request of des in order to facilitate the ssh upgrade in this branch. Revision Changes Path 1.6.2.14 +18 -11 src/usr.sbin/mergemaster/mergemaster.sh To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message