From owner-freebsd-current@FreeBSD.ORG Fri Sep 30 13:51:22 2005 Return-Path: X-Original-To: current@freebsd.org Delivered-To: freebsd-current@FreeBSD.ORG Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E94A116A45C; Fri, 30 Sep 2005 13:51:22 +0000 (GMT) (envelope-from doconnor@gsoft.com.au) Received: from cain.gsoft.com.au (cain.gsoft.com.au [203.31.81.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0EB5A43D48; Fri, 30 Sep 2005 13:51:21 +0000 (GMT) (envelope-from doconnor@gsoft.com.au) Received: from inchoate.gsoft.com.au (ppp219-232.lns1.adl2.internode.on.net [203.122.219.232]) (authenticated bits=0) by cain.gsoft.com.au (8.13.4/8.13.4) with ESMTP id j8UDop12037723 (version=TLSv1/SSLv3 cipher=RC4-MD5 bits=128 verify=NO); Fri, 30 Sep 2005 23:21:04 +0930 (CST) (envelope-from doconnor@gsoft.com.au) From: "Daniel O'Connor" To: freebsd-current@freebsd.org Date: Fri, 30 Sep 2005 23:20:35 +0930 User-Agent: KMail/1.8.2 References: <20050929224548.GB3035@comp.chem.msu.su> <20050930084218.GC80146@uk.tiscali.com> In-Reply-To: <20050930084218.GC80146@uk.tiscali.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart1650412.kWo8yImQIv"; protocol="application/pgp-signature"; micalg=pgp-sha1 Content-Transfer-Encoding: 7bit Message-Id: <200509302320.36572.doconnor@gsoft.com.au> X-Spam-Score: 0.05 () FORGED_RCVD_HELO X-Scanned-By: MIMEDefang 2.51 on 203.31.81.10 Cc: Yar Tikhiy , hackers@freebsd.org, current@freebsd.org, Brian Candler Subject: Re: A smarter mergemaster X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Sep 2005 13:51:23 -0000 --nextPart1650412.kWo8yImQIv Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Friday 30 September 2005 18:12, Brian Candler wrote: > On Fri, Sep 30, 2005 at 02:45:48AM +0400, Yar Tikhiy wrote: > > The fruitiest features are as follows: > > Will it automatically install new versions of files where the old one was > not altered? That's my biggest bugbear with mergemaster - it asks you abo= ut > a zillion files in /etc/rc.d which you have to manually agree to overwrite > just because the RCS ID has changed. In those cases where you've not > altered them yourself, I think you should just get the latest version. > However to do this properly, you'd need checksums of the original files. *broken record* Try etcmerge, it's in ports. I think the main problem is that you can't use etcmerge *right now* because= =20 you have to do one last manual merge to get a baseline etc directory. =2D-=20 Daniel O'Connor software and network engineer for Genesis Software - http://www.gsoft.com.au "The nice thing about standards is that there are so many of them to choose from." -- Andrew Tanenbaum GPG Fingerprint - 5596 B766 97C0 0E94 4347 295E E593 DC20 7B3F CE8C --nextPart1650412.kWo8yImQIv Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (FreeBSD) iD8DBQBDPUKs5ZPcIHs/zowRAhOOAJ98M63EpyO5PFlcL3zjcA43mc2g6gCeOmKt 8/3f7vcqDlWWuSXmxM3p9EA= =qBvb -----END PGP SIGNATURE----- --nextPart1650412.kWo8yImQIv--