Sean O'Connell wrote:
> 
> I run it when I notice that things have been changed in
> /usr/src/etc from my cvsup logs.  As a side-note, I became
> frustrated with mergemaster asking me about a whole bunch
> of files that I don't want it to touch.  I filed a PR that
> adds an IGNORE_LIST to the mergemaster script that is read
> out of the .mergemasterrc.
> 

One way I got around that is to merge the "$FreeBSD .... " version line
over, since the standard mode just checks version strings.  mergemaster
-s will notice they are different.

I hope this helps.

Jim
-- 
Artificial intelligence is no match for natural stupidity.


To Unsubscribe: send mail to [EMAIL PROTECTED]
with "unsubscribe freebsd-stable" in the body of the message

Reply via email to