From owner-freebsd-stable Tue Mar 4 14: 7:14 2003 Delivered-To: freebsd-stable@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 14E4E37B401 for ; Tue, 4 Mar 2003 14:07:12 -0800 (PST) Received: from whale.sunbay.crimea.ua (whale.sunbay.crimea.ua [212.110.138.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3D33443FBD for ; Tue, 4 Mar 2003 14:07:06 -0800 (PST) (envelope-from ru@whale.sunbay.crimea.ua) Received: from whale.sunbay.crimea.ua (root@localhost) by whale.sunbay.crimea.ua (8.12.8/8.12.8/Sunbay) with SMTP id h24M73fL075198 for ; Wed, 5 Mar 2003 00:07:03 +0200 (EET) (envelope-from ru@whale.sunbay.crimea.ua) Received: from whale.sunbay.crimea.ua (ru@localhost [127.0.0.1]) by whale.sunbay.crimea.ua (8.12.8/8.12.8/Sunbay) with ESMTP id h24M72wW075167 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO); Wed, 5 Mar 2003 00:07:02 +0200 (EET) (envelope-from ru@whale.sunbay.crimea.ua) Received: (from ru@localhost) by whale.sunbay.crimea.ua (8.12.8/8.12.8/Submit) id h24M71fq075162; Wed, 5 Mar 2003 00:07:01 +0200 (EET) (envelope-from ru) Date: Wed, 5 Mar 2003 00:07:01 +0200 From: Ruslan Ermilov To: Ceri Davies Cc: Doug Barton , stable@freebsd.org Subject: Re: r1.322 of src/Makefile.inc1 Message-ID: <20030304220701.GC73366@sunbay.com> References: <20030304165037.GA7463@submonkey.net> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="XWOWbaMNXpFDWE00" Content-Disposition: inline In-Reply-To: <20030304165037.GA7463@submonkey.net> User-Agent: Mutt/1.5.1i Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG --XWOWbaMNXpFDWE00 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Mar 04, 2003 at 04:50:37PM +0000, Ceri Davies wrote: >=20 > Was this behaviour from mergemaster intended ? >=20 >=20 > *** Displaying differences between ./etc/login.conf.db and installed ve= rsion: >=20 > Binary files /etc/login.conf.db and ./etc/login.conf.db differ >=20 > Use 'd' to delete the temporary ./etc/login.conf.db > Use 'i' to install the temporary ./etc/login.conf.db > Use 'm' to merge the temporary and installed versions > Use 'v' to view the diff results again >=20 > Default is to leave the temporary file to deal with by hand >=20 > How should I deal with this? [Leave it for later] d >=20 > *** Deleting ./etc/login.conf.db >=20 Sorry, I don't use mergemaster(8) so I can't say. Doug was all for this change, so he may be of some help here. Cheers, --=20 Ruslan Ermilov Sysadmin and DBA, ru@sunbay.com Sunbay Software AG, ru@FreeBSD.org FreeBSD committer, +380.652.512.251 Simferopol, Ukraine http://www.FreeBSD.org The Power To Serve http://www.oracle.com Enabling The Information Age --XWOWbaMNXpFDWE00 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (FreeBSD) iD8DBQE+ZSOFUkv4P6juNwoRAukGAJ9oYSAThF38QTEVhrsx0HKK+xg0TQCgjBBH BHGtX38v0NURF2yt7+AGhGw= =mQhJ -----END PGP SIGNATURE----- --XWOWbaMNXpFDWE00-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message