From owner-cvs-all  Wed Jun 26  7:19:53 2002
Delivered-To: cvs-all@freebsd.org
Received: from mail-relay1.yahoo.com (mail-relay1.yahoo.com [216.145.48.34])
	by hub.freebsd.org (Postfix) with ESMTP
	id B821C37B400; Wed, 26 Jun 2002 07:19:48 -0700 (PDT)
Received: from FreeBSD.org (12-234-90-219.client.attbi.com [12.234.90.219])
	by mail-relay1.yahoo.com (Postfix) with ESMTP
	id 535A98B5BF; Wed, 26 Jun 2002 07:19:48 -0700 (PDT)
Message-ID: <3D19CD83.EE959DAE@FreeBSD.org>
Date: Wed, 26 Jun 2002 07:19:47 -0700
From: Doug Barton <DougB@FreeBSD.org>
Organization: Triborough Bridge & Tunnel Authority
X-Mailer: Mozilla 4.79 [en] (X11; U; FreeBSD 4.6-RELEASE i386)
X-Accept-Language: en
MIME-Version: 1.0
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: Re: cvs commit: src/usr.sbin/mergemaster mergemaster.sh
References: <200206261414.g5QEE7Qd074556@freefall.freebsd.org>
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
List-ID: <cvs-all.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

Doug Barton wrote:
> 
> dougb       2002/06/26 07:14:07 PDT
> 
>   Modified files:
>     usr.sbin/mergemaster mergemaster.sh
>   Log:
>   Add 'chflags -R noschg' to the deletion process for the TEMPROOT
>   directory so that /var/empty, and any other such items that are
>   added in the future can be deleted effectively.
> 
>   Revision  Changes    Path
>   1.34      +2 -1      src/usr.sbin/mergemaster/mergemaster.sh
> 
> http://www.FreeBSD.org/cgi/cvsweb.cgi/src/usr.sbin/mergemaster/mergemaster.sh.diff?&r1=1.33&r2=1.34&f=h

I should have commented in the commit that this problem was caught by
Sheldon, and that it will be MFC'ed when we're sure that the flag will
be schg. 

-- 
   "We have known freedom's price. We have shown freedom's power.
      And in this great conflict, ...  we will see freedom's victory."
	- George W. Bush, President of the United States
          State of the Union, January 28, 2002

         Do YOU Yahoo!?

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message