RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?

Bruce Cran bruce at cran.org.uk
Tue May 5 23:40:15 UTC 2009


On Tue, 05 May 2009 14:28:22 -0700
Doug Barton <dougb at 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


More information about the freebsd-stable mailing list