From owner-freebsd-stable@FreeBSD.ORG Tue May 5 16:54:18 2009 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B654510656CD for ; Tue, 5 May 2009 16:54:18 +0000 (UTC) (envelope-from rsmith@xs4all.nl) Received: from smtp-vbr12.xs4all.nl (smtp-vbr12.xs4all.nl [194.109.24.32]) by mx1.freebsd.org (Postfix) with ESMTP id 2C8C68FC16 for ; Tue, 5 May 2009 16:54:17 +0000 (UTC) (envelope-from rsmith@xs4all.nl) Received: from slackbox.xs4all.nl (slackbox.xs4all.nl [213.84.242.160]) by smtp-vbr12.xs4all.nl (8.13.8/8.13.8) with ESMTP id n45GsFCJ058719; Tue, 5 May 2009 18:54:15 +0200 (CEST) (envelope-from rsmith@xs4all.nl) Received: by slackbox.xs4all.nl (Postfix, from userid 1001) id F3FB8BAA7; Tue, 5 May 2009 18:54:14 +0200 (CEST) Date: Tue, 5 May 2009 18:54:14 +0200 From: Roland Smith To: Daniel Gerzo Message-ID: <20090505165414.GA31550@slackbox.xs4all.nl> References: <20090504225012.392fa49f.torfinn.ingolfsen@broadpark.no> <49FF5901.600@gmail.com> <49FFEECE.20403@FreeBSD.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="1yeeQ81UyVL57Vl7" Content-Disposition: inline In-Reply-To: <49FFEECE.20403@FreeBSD.org> X-GPG-Fingerprint: 1A2B 477F 9970 BA3C 2914 B7CE 1277 EFB0 C321 A725 X-GPG-Key: http://www.xs4all.nl/~rsmith/pubkey.txt X-GPG-Notice: If this message is not signed, don't assume I sent it! User-Agent: Mutt/1.5.19 (2009-01-05) X-Virus-Scanned: by XS4ALL Virus Scanner Cc: Torfinn Ingolfsen , freebsd-stable@freebsd.org, Manolis Kiagias Subject: Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE? X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 May 2009 16:54:19 -0000 --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--