Date: Fri, 20 Jul 2001 16:35:29 -0700 From: Brooks Davis <brooks@one-eyed-alien.net> To: Brian Somers <brian@Awfulhak.org> Cc: net@FreeBSD.ORG, hackers@FreeBSD.ORG Subject: Re: interface cloning MFC Message-ID: <20010720163529.A16952@Odin.AC.HMC.Edu> In-Reply-To: <200107202329.f6KNTDg17187@hak.lan.Awfulhak.org>; from brian@Awfulhak.org on Sat, Jul 21, 2001 at 12:29:13AM %2B0100 References: <brooks@one-eyed-alien.net> <200107202329.f6KNTDg17187@hak.lan.Awfulhak.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On Sat, Jul 21, 2001 at 12:29:13AM +0100, Brian Somers wrote: > This works nicely on my -stale box. Thanks. > > One niggle though :) It's probably worth changing > ``$FreeBSD: ........$'' to ``$FreeBSD$'' in your patched version. > Without this, mergemaster assumes that the new version in /usr/src/etc > is the same as the /etc version (same Ids). This caused a problem > here, I fixed the problem and went to prepare a patch for you.... the > patch file came up empty -- you already had the missing ``create'' in > your patches (of course) :*D I've updated the patch again. I'd run into that problem but didn't think to just unexpand the $FreeBSD$ and then promptly forgot about it. Thanks, Brooks -- Any statement of the form "X is the one, true Y" is FALSE. PGP fingerprint 655D 519C 26A7 82E7 2529 9BF0 5D8E 8BE9 F238 1AD4 [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.6 (GNU/Linux) Comment: For info see http://www.gnupg.org iD8DBQE7WMBAXY6L6fI4GtQRArnqAKDPTEYpw1WAqplg9RkswXuCEzm/MgCg3FEo Bc8amOhnFtHbb7FSrSujYiM= =OVqW -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010720163529.A16952>