Date: Thu, 8 Jan 2009 14:30:39 +0100 (CET) From: Oliver Fromme <olli@lurza.secnetix.de> To: freebsd-stable@FreeBSD.ORG, jcw@highperformance.net Subject: Re: Version Number Only Changes Message-ID: <200901081330.n08DUdY1008553@lurza.secnetix.de> In-Reply-To: <4965FC41.4080901@highperformance.net>
next in thread | previous in thread | raw e-mail | index | archive | help
Jason C. Wells wrote: > I am sure there is a reason for it. Upon running mergemaster this time > through it seemed like there were _a lot_ of files where the only change > was the version number. I have run to mergemaster on four more hosts. Ugh! > > mergemaster -aiU still seems to require a ton of interaction. Is there > a better way? I have the following in /etc/mergemaster.rc: DIFF_FLAG='-Bub' DIFF_OPTIONS='-I$FreeBSD:.*[$]' IGNORE_MOTD=yes Also, I'm not sure you really want to use the -a option. Best regards Oliver -- Oliver Fromme, secnetix GmbH & Co. KG, Marktplatz 29, 85567 Grafing b. M. Handelsregister: Registergericht Muenchen, HRA 74606, Geschäftsfuehrung: secnetix Verwaltungsgesellsch. mbH, Handelsregister: Registergericht Mün- chen, HRB 125758, Geschäftsführer: Maik Bachmann, Olaf Erb, Ralf Gebhart FreeBSD-Dienstleistungen, -Produkte und mehr: http://www.secnetix.de/bsd "When your hammer is C++, everything begins to look like a thumb." -- Steve Haflich, in comp.lang.c++
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200901081330.n08DUdY1008553>