From owner-freebsd-current@FreeBSD.ORG Fri Sep 30 01:11:51 2005 Return-Path: X-Original-To: freebsd-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 C8FFB16A41F; Fri, 30 Sep 2005 01:11:51 +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 2655E43D49; Fri, 30 Sep 2005 01:11:50 +0000 (GMT) (envelope-from doconnor@gsoft.com.au) Received: from inchoate.gsoft.com.au (inchoate.gsoft.com.au [203.31.81.31]) (authenticated bits=0) by cain.gsoft.com.au (8.13.4/8.13.4) with ESMTP id j8U1BF1h020820 (version=TLSv1/SSLv3 cipher=RC4-MD5 bits=128 verify=NO); Fri, 30 Sep 2005 10:41:21 +0930 (CST) (envelope-from doconnor@gsoft.com.au) From: "Daniel O'Connor" To: freebsd-current@freebsd.org Date: Fri, 30 Sep 2005 10:41:09 +0930 User-Agent: KMail/1.8.2 References: <20050929224548.GB3035@comp.chem.msu.su> In-Reply-To: <20050929224548.GB3035@comp.chem.msu.su> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart1667406.x3QNet1TlP"; protocol="application/pgp-signature"; micalg=pgp-sha1 Content-Transfer-Encoding: 7bit Message-Id: <200509301041.10480.doconnor@gsoft.com.au> X-Spam-Score: -2.82 () ALL_TRUSTED X-Scanned-By: MIMEDefang 2.51 on 203.31.81.10 Cc: Yar Tikhiy , hackers@freebsd.org, current@freebsd.org 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 01:11:52 -0000 --nextPart1667406.x3QNet1TlP Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Friday 30 September 2005 08:15, Yar Tikhiy wrote: > Feedback is welcome. And please please don't skip making a backup of > your /etc before running mergemaster! I can't be responsible for its > loss due to bugs in my code or whatever. This work does look neat, but.. Try etcmerge :) It's a bit of a pain to get started with it, but it is a *lot* faster (huma= n=20 input wise) than mergemaster. It only asks you about files that you have=20 modified rather than ones that have been changed by committers (ie does a 3= =20 way merge). It does have problems handling DB files, but that is usually not a big prob= lem=20 to fix. =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 --nextPart1667406.x3QNet1TlP Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (FreeBSD) iD8DBQBDPJCu5ZPcIHs/zowRAonsAKClO/GZv+6Mm0Y542IHl/x9m/Y4JgCeKIdo 8rpLcz3uZ704OXNvs66ykMs= =nv9V -----END PGP SIGNATURE----- --nextPart1667406.x3QNet1TlP--