Re: A smarter mergemaster

• Previous message: Alex Zbyslaw: "Re: A smarter mergemaster"
• In reply to: Brian Candler: "Re: A smarter mergemaster"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

To: freebsd-current@freebsd.org
Date: Fri, 30 Sep 2005 23:20:35 +0930

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 about
> 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
you have to do one last manual merge to get a baseline etc directory.

-- 
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

• application/pgp-signature attachment: stored

• Previous message: Alex Zbyslaw: "Re: A smarter mergemaster"
• In reply to: Brian Candler: "Re: A smarter mergemaster"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]