Date: Tue, 10 Jan 2012 14:36:59 +0100 From: Martin Koch Andersen <martin@925.dk> To: freebsd-questions@freebsd.org Subject: freebsd-update auto merge fails on trivial VC lines Message-ID: <6D57A974-1235-461E-A164-DBFC798A8560@925.dk>
next in thread | raw e-mail | index | archive | help
Hello, When upgrading from FreeBSD 8.2-RELEASE to 9.0-RELEASE using = freebsd-update, I'm asked to merge, what seems like, everything in /etc = manually. And all of the merges are trivial version controls lines. E.g. my /etc/amd.map (which I never modified) begins with: # $FreeBSD: releng/8.2/etc/amd.map 164015 2006-11-06 01:42:11Z obrien $ And this file (and line) freebsd-update asks me to manually merge. I = wonder why that is. Kind regards, --=20 Martin Koch Andersen http://925.dk=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6D57A974-1235-461E-A164-DBFC798A8560>