Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 24 Jan 2014 11:33:01 -0500
From:      Rick Miller <>
To:        FreeBSD Questions <>
Subject:   freebsd-update automerge ignoring mergemaster.rc?
Message-ID:  <>

Next in thread | Raw E-Mail | Index | Archive | Help
Hi all,

Running FreeBSD 8.4-RELEASE-p7 and attempting to upgrade to 10.0-RELEASE
via freebsd-update as instructed at has resulted in
errors during the automatic merge that occurs during "freebsd-update
upgrade -r 10.0-RELEASE".

The results are many merges that could not occur mainly due to the CVS
version lines despite having /etc/mergemaster.rc setup.  Here is the
contents of the config file:

/*** /etc/mergemaster.rc ***/

root@iese-bsd100-dev:~ # cat /etc/mergemaster.rc
# Automatically install files that do not exist
# Automatically upgrade files that have not been edited
# Ignore files that I don't want changed
# Do not display changes that only affect whitespace
# Ignore CVS id lines to stop replacing files where only that line has

/*** /etc/mergemaster.rc ***/

I have tried different variations of DIFF_FLAG, "'-Bub'", and DIFF_OPTIONS,
'-I $FreeBSD:.*[$]', both of which resulted in the same behavior.  Based on
threads I've read in the archives and a couple posts on the forums, this
seems correct.  Wondering if anyone has any thoughts and/or suggestions?

Take care
Rick Miller

Want to link to this message? Use this URL: <>