On 06/11/2011 19:25, Randal L. Schwartz wrote:
When following the instructions at
http://www.freebsd.org/releases/8.2R/announce.html
to go from 8.1 to 8.2, I'm presented during the command:
freebsd-update upgrade -r 8.2-RELEASE
with no less than *** 322 *** files that differ only
When following the instructions at
http://www.freebsd.org/releases/8.2R/announce.html
to go from 8.1 to 8.2, I'm presented during the command:
freebsd-update upgrade -r 8.2-RELEASE
with no less than *** 322 *** files that differ only by the CVS tag.
After hitting about 150 of these with
On Sun, 06 Nov 2011 13:25:30 -0600, Randal L. Schwartz
mer...@stonehenge.com wrote:
Why doesn't the freebsd-update command invoke mergemaster with -F?
Or is there some step that I'm leaving out?
Does freebsd-update follow /etc/mergemaster.rc?
# Automatically install files that do not
Mark == Mark Felder f...@feld.me writes:
Mark Does freebsd-update follow /etc/mergemaster.rc?
No, apparently it just calls classic merge, which doesn't have any
kind of ignore CVS tags. No wonder it's painful.
But surely, I'm not the only one using freebsd-update. Does everyone
else put up
On Sun, Nov 06, 2011 at 11:54:27AM -0800, Randal L. Schwartz wrote:
Mark == Mark Felder f...@feld.me writes:
Mark Does freebsd-update follow /etc/mergemaster.rc?
No, apparently it just calls classic merge, which doesn't have any
kind of ignore CVS tags. No wonder it's painful.
But
