Date: Wed, 6 May 2009 00:40:09 +0100 From: Bruce Cran <bruce@cran.org.uk> To: Doug Barton <dougb@FreeBSD.org> Cc: Torfinn Ingolfsen <torfinn.ingolfsen@broadpark.no>, freebsd-stable@freebsd.org Subject: Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE? Message-ID: <20090506004009.12729c32@gluon.draftnet> In-Reply-To: <4A00AF76.8010604@FreeBSD.org> References: <20090504225012.392fa49f.torfinn.ingolfsen@broadpark.no> <4A00AF76.8010604@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, 05 May 2009 14:28:22 -0700 Doug Barton <dougb@FreeBSD.org> wrote: > Torfinn Ingolfsen wrote: > > Ok, this is strange. > > > > I just upgraded from 7.2-prerelease (as of 20090401) to 7.2-stable > > as of today, using csup and building world. > > I've read this thread and find the whole thing very odd. In particular > regarding your case, the last change to mergemaster was done on March > 23rd, so if you updated a system on April 1st then again on May 4th > you should have been using the same version of mergemaster. There was a recent thread on -questions about this issue too, with the title "mergemaster -U overwriting modified files". I've seen mergemaster clobber named.conf but I've failed to repeat it despite changing the revision, file timestamp etc. -- Bruce Cran
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090506004009.12729c32>