Date: Wed, 5 Mar 2003 00:29:52 -0800 (PST) From: Doug Barton <DougB@FreeBSD.org> To: Ceri Davies <setantae@submonkey.net> Cc: ru@FreeBSD.org, stable@FreeBSD.org, re@freebsd.org Subject: Re: r1.322 of src/Makefile.inc1 Message-ID: <20030305002450.V18288@znfgre.tberna.bet> In-Reply-To: <20030304165037.GA7463@submonkey.net> References: <20030304165037.GA7463@submonkey.net>
next in thread | previous in thread | raw e-mail | index | archive | help
This message is in MIME format. The first part should be readable text,
while the remaining parts are likely unreadable without MIME-aware tools.
Send mail to mime@docserver.cac.washington.edu for more info.
--0-1090301574-1046852992=:18288
Content-Type: TEXT/PLAIN; charset=US-ASCII
On Tue, 4 Mar 2003, Ceri Davies wrote:
>
> Was this behaviour from mergemaster intended ?
Depends on what you mean by "behaviour from mergemaster." :) It relies
entirely on src/etc/Makefile to "know" (or more precisely, to avoid
knowledge of) what files to deal with.
I just committed the attached patch to fix this on -current. Release
engineers, I'd like to MFC it before 4.8 if possible. The only .db files
that exist currently in TEMPROOT are the password files that were already
being deleted, and the newly added login.conf.db; so there won't be any
actual difference in user experience.
Doug
> *** Displaying differences between ./etc/login.conf.db and installed version:
>
> Binary files /etc/login.conf.db and ./etc/login.conf.db differ
>
> 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
>
> Default is to leave the temporary file to deal with by hand
>
> How should I deal with this? [Leave it for later] d
>
> *** Deleting ./etc/login.conf.db
>
>
> Ceri
>
>
--
This .signature sanitized for your protection
--0-1090301574-1046852992=:18288
Content-Type: TEXT/PLAIN; charset=US-ASCII; name="mm.diff"
Content-Transfer-Encoding: BASE64
Content-ID: <20030305002952.L18288@znfgre.tberna.bet>
Content-Description:
Content-Disposition: attachment; filename="mm.diff"
SW5kZXg6IG1lcmdlbWFzdGVyLnNoDQo9PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
DQpSQ1MgZmlsZTogL2hvbWUvbmN2cy9zcmMvdXNyLnNiaW4vbWVyZ2VtYXN0
ZXIvbWVyZ2VtYXN0ZXIuc2gsdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjQx
DQpyZXRyaWV2aW5nIHJldmlzaW9uIDEuNDINCmRpZmYgLXUgLXIxLjQxIC1y
MS40Mg0KLS0tIG1lcmdlbWFzdGVyLnNoCTUgRmViIDIwMDMgMTE6MDk6MjEg
LTAwMDAJMS40MQ0KKysrIG1lcmdlbWFzdGVyLnNoCTUgTWFyIDIwMDMgMDg6
MjA6NTUgLTAwMDAJMS40Mg0KQEAgLTU1NCwxMSArNTU0LDExIEBADQogICA7
OyAjIEVuZCBvZiB0aGUgIlJFUlVOIiB0ZXN0DQogZXNhYw0KIA0KLSMgV2Ug
cmVhbGx5IGRvbid0IHdhbnQgdG8gaGF2ZSB0byBkZWFsIHdpdGggdGhlc2Ug
ZmlsZXMsIHNpbmNlDQotIyBtYXN0ZXIucGFzc3dkIGlzIHRoZSByZWFsIGZp
bGUgdGhhdCBzaG91bGQgYmUgY29tcGFyZWQsIHRoZW4NCi0jIHRoZSB1c2Vy
IHNob3VsZCBydW4gcHdkX21rZGIgaWYgbmVjZXNzYXJ5Lg0KKyMgV2UgcmVh
bGx5IGRvbid0IHdhbnQgdG8gaGF2ZSB0byBkZWFsIHdpdGggZmlsZXMgbGlr
ZSBsb2dpbi5jb25mLmRiLCBwd2QuZGIsDQorIyBvciBzcHdkLmRiLiAgSW5z
dGVhZCwgd2Ugd2FudCB0byBjb21wYXJlIHRoZSB0ZXh0IHZlcnNpb25zLCBh
bmQgcnVuICpfbWtkYi4NCisjIFByb21wdCB0aGUgdXNlciB0byBkbyBzbyBi
ZWxvdywgYXMgbmVlZGVkLg0KICMNCi1ybSAtZiAke1RFTVBST09UfS9ldGMv
c3B3ZC5kYiAke1RFTVBST09UfS9ldGMvcGFzc3dkICR7VEVNUFJPT1R9L2V0
Yy9wd2QuZGINCitybSAtZiAke1RFTVBST09UfS9ldGMvKi5kYg0KIA0KICMg
V2Ugb25seSBuZWVkIHRvIGNvbXBhcmUgdGhpbmdzIGxpa2UgZnJlZWJzZC5j
ZiBvbmNlDQogZmluZCAke1RFTVBST09UfS91c3Ivb2JqIC10eXBlIGYgLWRl
bGV0ZSAyPi9kZXYvbnVsbA0K
--0-1090301574-1046852992=:18288--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-stable" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030305002450.V18288>