Date: Tue, 5 May 2009 18:54:14 +0200 From: Roland Smith <rsmith@xs4all.nl> To: Daniel Gerzo <danger@freebsd.org> Cc: Torfinn Ingolfsen <torfinn.ingolfsen@broadpark.no>, freebsd-stable@freebsd.org, Manolis Kiagias <sonic2000gr@gmail.com> Subject: Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE? Message-ID: <20090505165414.GA31550@slackbox.xs4all.nl> In-Reply-To: <49FFEECE.20403@FreeBSD.org> References: <20090504225012.392fa49f.torfinn.ingolfsen@broadpark.no> <49FF5901.600@gmail.com> <49FFEECE.20403@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--1yeeQ81UyVL57Vl7 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, May 05, 2009 at 09:46:22AM +0200, Daniel Gerzo wrote: > Manolis Kiagias wrote: >=20 > > I always use -iU too. > > I've lost motd, passwd, group and master.passwd > > During mergemaster -p I was asked to merge changes to some of these, and > > still they were replaced with the newer versions. I don't know what went > > wrong but have restored them from backup. (I always tar /etc before a > > source upgrade). Upgrading another system using freebsd-update did not > > cause any problem. >=20 > I have the same experience while I was upgrading a few machines=20 > upgrading from RELENG_7 to RELENG_7_2. I haven't experienced when=20 > upgrading from 7.1-R to 7.2-R. >=20 > Here auth.conf, csh.cshrc, hosts, crontab, syslogd.conf, passswd,=20 > master.passwd, group, sysctl.conf motd and maybe some more got=20 > overwritten :-( I had to restore from backups. When upgrading from 7-STABLE to 7.2-RELEASE mergemaster -s -i -U overwrote all the file I'd changed without asking. Luckily I keep all config files that I've changed in a separate repository, so putting it all back was a question of running an install script. But the change is annoying. Roland --=20 R.F.Smith http://www.xs4all.nl/~rsmith/ [plain text _non-HTML_ PGP/GnuPG encrypted/signed email much appreciated] pgp: 1A2B 477F 9970 BA3C 2914 B7CE 1277 EFB0 C321 A725 (KeyID: C321A725) --1yeeQ81UyVL57Vl7 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.11 (FreeBSD) iEYEARECAAYFAkoAbzYACgkQEnfvsMMhpyW8KgCeJRs5eh2ofqHa4oX390DYX3I4 FSwAoK+6g9Vzic/Pt/u6/z5vQ8WjV/S5 =CTZq -----END PGP SIGNATURE----- --1yeeQ81UyVL57Vl7--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090505165414.GA31550>