From owner-freebsd-current@FreeBSD.ORG Wed Nov 28 23:27:50 2007 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F102416A417 for ; Wed, 28 Nov 2007 23:27:50 +0000 (UTC) (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 5B37013C458 for ; Wed, 28 Nov 2007 23:27:50 +0000 (UTC) (envelope-from doconnor@gsoft.com.au) Received: from inchoate.gsoft.com.au (inchoate.gsoft.com.au [203.31.81.30]) (authenticated bits=0) by cain.gsoft.com.au (8.13.8/8.13.8) with ESMTP id lASNQUxg015522 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 29 Nov 2007 09:56:32 +1030 (CST) (envelope-from doconnor@gsoft.com.au) From: "Daniel O'Connor" To: "Kevin Oberman" Date: Thu, 29 Nov 2007 09:56:27 +1030 User-Agent: KMail/1.9.7 References: <20071128211626.0BB084500E@ptavv.es.net> In-Reply-To: <20071128211626.0BB084500E@ptavv.es.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart1424075.h0Zc7ht8eL"; protocol="application/pgp-signature"; micalg=pgp-sha1 Content-Transfer-Encoding: 7bit Message-Id: <200711290956.28281.doconnor@gsoft.com.au> X-Spam-Score: -3.977 () ALL_TRUSTED,BAYES_00 X-Scanned-By: MIMEDefang 2.58 on 203.31.81.10 Cc: Giorgos Keramidas , freebsd-current@freebsd.org, "Aryeh M. Friedman" Subject: Re: idea bouncing: using cvs as a replacement for 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: Wed, 28 Nov 2007 23:27:51 -0000 --nextPart1424075.h0Zc7ht8eL Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Thu, 29 Nov 2007, Kevin Oberman wrote: > > It is a port - sysutils/etcmerge. > > Another simple solution, which needs more publicity, is 'mergemaster > -U'. I do my updates using -Ui and seldom have to deal any manual > merge. It's not perfect as I still need to deal with locally modified > files, but "it's good enough". The beauty of etcmerge is that only conflicting changes are a problem=20 and they are quite rare. It does require a refence copy the first time you run it but that is=20 easily obtained by running mergemaster once, after that it updates it=20 automatically. =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 --nextPart1424075.h0Zc7ht8eL Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.4 (FreeBSD) iD8DBQBHTfkk5ZPcIHs/zowRAmAAAJ4td9nhAnxeZbdRhErMc7wVf+V05ACgqjGI y1iUpBtqEgiQ9BARwB6q724= =/DEO -----END PGP SIGNATURE----- --nextPart1424075.h0Zc7ht8eL--