Date: Fri, 30 Sep 2005 23:20:35 +0930 From: "Daniel O'Connor" <doconnor@gsoft.com.au> To: freebsd-current@freebsd.org Cc: Yar Tikhiy <yar@comp.chem.msu.su>, hackers@freebsd.org, current@freebsd.org, Brian Candler <B.Candler@pobox.com> Subject: Re: A smarter mergemaster Message-ID: <200509302320.36572.doconnor@gsoft.com.au> In-Reply-To: <20050930084218.GC80146@uk.tiscali.com> References: <20050929224548.GB3035@comp.chem.msu.su> <20050930084218.GC80146@uk.tiscali.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200509302320.36572.doconnor>