Date: Thu, 29 Nov 2007 09:56:27 +1030 From: "Daniel O'Connor" <doconnor@gsoft.com.au> To: "Kevin Oberman" <oberman@es.net> Cc: Giorgos Keramidas <keramida@ceid.upatras.gr>, freebsd-current@freebsd.org, "Aryeh M. Friedman" <aryeh.friedman@gmail.com> Subject: Re: idea bouncing: using cvs as a replacement for mergemaster Message-ID: <200711290956.28281.doconnor@gsoft.com.au> In-Reply-To: <20071128211626.0BB084500E@ptavv.es.net> References: <20071128211626.0BB084500E@ptavv.es.net>
next in thread | previous in thread | raw e-mail | index | archive | help
--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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200711290956.28281.doconnor>