Re: Automating MERGEMASTER(8)

2007-03-22 Thread Kyrre Nygård
At 00:29 17.03.2007, Pieter de Goeje wrote: On Friday 16 March 2007 10:32, Kyrre Nygård wrote: > Hello, > > Is it possible to make MERGEMASTER(8) automatically replace files > with a FreeBSD CVS Id, and skip (or prompt interactively) the ones > without a FreeBSD CVS Id? The ones without are most

Re: Automating MERGEMASTER(8)

2007-03-16 Thread Pieter de Goeje
On Friday 16 March 2007 10:32, Kyrre Nygård wrote: > Hello, > > Is it possible to make MERGEMASTER(8) automatically replace files > with a FreeBSD CVS Id, and skip (or prompt interactively) the ones > without a FreeBSD CVS Id? The ones without are most certainly my own > personalized configuration

Automating MERGEMASTER(8)

2007-03-16 Thread Kyrre Nygård
Hello, Is it possible to make MERGEMASTER(8) automatically replace files with a FreeBSD CVS Id, and skip (or prompt interactively) the ones without a FreeBSD CVS Id? The ones without are most certainly my own personalized configuration files. I'd really like to keep them intact. And on every