From owner-cvs-all@FreeBSD.ORG  Sat Apr 29 18:21:44 2006
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
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 9019D16A402;
	Sat, 29 Apr 2006 18:21:44 +0000 (UTC)
	(envelope-from gordon@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5F31043D45;
	Sat, 29 Apr 2006 18:21:44 +0000 (GMT)
	(envelope-from gordon@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3TILiYp020757;
	Sat, 29 Apr 2006 18:21:44 GMT
	(envelope-from gordon@repoman.freebsd.org)
Received: (from gordon@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3TILije020756;
	Sat, 29 Apr 2006 18:21:44 GMT (envelope-from gordon)
Message-Id: <200604291821.k3TILije020756@repoman.freebsd.org>
From: Gordon Tetlow <gordon@FreeBSD.org>
Date: Sat, 29 Apr 2006 18:21:44 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.8 mergemaster.sh
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 29 Apr 2006 18:21:44 -0000

gordon      2006-04-29 18:21:44 UTC

  FreeBSD src repository

  Modified files:
    usr.sbin/mergemaster mergemaster.8 mergemaster.sh 
  Log:
  Add auto upgrade capability to mergemaster.
  
  An mtree description of all non-zero files that make
  distribution installs (only size and md5) is built from the
  temproot.  When the user completes a mergemaster run, the
  mtree description file gets installed into /var/db for
  safe-keeping.
  
  When the user then decides to do a subsequent upgrade (with
  the -U flag), the existing mtree description from /var/db
  is called into service looking for files that are different in
  DESTDIR. This is stashed away until a file that would normally
  end up prompting the user to look at changes is encountered.
  Since there are no user modified changes, the new file is
  installed without bothering the user.
  
  Looked at by:   dougb
  MFC after:      6 weeks
  
  Revision  Changes    Path
  1.35      +2 -0      src/usr.sbin/mergemaster/mergemaster.8
  1.54      +86 -1     src/usr.sbin/mergemaster/mergemaster.sh