Date: Wed, 14 Jun 2000 23:54:06 -0400 From: James Housley <jim@thehousleys.net> To: "Sean O'Connell" <sean@stat.Duke.EDU>, freebsd-stable@freebsd.org Subject: Re: How often to run mergemaster? Message-ID: <3948535E.45E0F06F@thehousleys.net> References: <200006150312.XAA11324@sanson.reyes.somos.net> <20000614234019.B976@stat.Duke.EDU>
next in thread | previous in thread | raw e-mail | index | archive | help
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 majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3948535E.45E0F06F>