From owner-freebsd-hackers  Wed Jun 13 20: 8:28 2001
Delivered-To: freebsd-hackers@freebsd.org
Received: from mailout1.nyroc.rr.com (mailout1-1.nyroc.rr.com [24.92.226.146])
	by hub.freebsd.org (Postfix) with ESMTP
	id 9605A37B40D; Wed, 13 Jun 2001 20:08:20 -0700 (PDT)
	(envelope-from James_Bond_79@yahoo.com)
Received: from Halstead007 (roc-24-169-196-57.rochester.rr.com [24.169.196.57])
	by mailout1.nyroc.rr.com (8.11.2/RoadRunner 1.03) with SMTP id f5E36tf24159;
	Wed, 13 Jun 2001 23:06:56 -0400 (EDT)
Content-Type: text/plain;
  charset="iso-8859-1"
From: James <James_Bond_79@yahoo.com>
To: dougb@freebsd.org
Subject: mergmaster bug
Date: Wed, 13 Jun 2001 23:14:58 -0400
X-Mailer: KMail [version 1.2]
Cc: freebsd-hackers@freebsd.org
MIME-Version: 1.0
Message-Id: <01061323145802.00417@Halstead007>
Content-Transfer-Encoding: 8bit
Sender: owner-freebsd-hackers@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-hackers.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo?subject=subscribe%20freebsd-hackers>
List-Unsubscribe: <mailto:majordomo?subject=unsubscribe%20freebsd-hackers>
X-Loop: FreeBSD.ORG

Just noticed a small bug in mergemaster:

When using specifying the destdir with -D and in verbose mode, mergemaster 
will not properly display the list of files that are only in ${DESTDIR}/etc, 
because the diff has /etc hardcoded. See the diff below.

While on the mergemaster topic, I have seen discussion in the past about 
using md5 to see if the live /etc files have been modified since installed 
the last time mergemaster was run, and just installing new versions if the 
local have not been modified. Has anything been done with this?

James

--- mergemaster.sh.orig Wed Jun 13 20:08:01 2001
+++ mergemaster.sh      Wed Jun 13 21:09:54 2001
@@ -471,7 +471,7 @@
     echo ' *** Press [Enter] or [Return] key to continue'
     read ANY_KEY
     unset ANY_KEY
-    diff -qr ${DESTDIR}/etc ${TEMPROOT}/etc | grep "^Only in /etc" | ${PAGER}
+    diff -qr ${DESTDIR}/etc ${TEMPROOT}/etc | grep "^Only in ${DESTDIR}/etc" 
|
${PAGER}
     echo ''
     echo ' *** Press [Enter] or [Return] key to continue'
     read ANY_KEY

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