Date: Mon, 6 Jul 2009 13:08:52 +0200 From: Ed Schouten <ed@80386.nl> To: Eygene Ryabinkin <rea-fbsd@codelabs.ru> Cc: Ian Freislich <ianf@clue.co.za>, current@freebsd.org, dougb@freebsd.org Subject: Re: pebkac, but is it a mergemaster bug? Message-ID: <20090706110852.GD48776@hoeg.nl> In-Reply-To: <JihCfvLYurSbwCvYPMTikKEUsuo@OeoW5JVkL3r5Dz%2BLWqlFPl5E0fc> References: <E1MNOcw-0001uh-K3@clue.co.za> <JihCfvLYurSbwCvYPMTikKEUsuo@OeoW5JVkL3r5Dz%2BLWqlFPl5E0fc>
next in thread | previous in thread | raw e-mail | index | archive | help
--FVcNYgCArjuDqTR+ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Eygene, * Eygene Ryabinkin <rea-fbsd@codelabs.ru> wrote: > Doug, I am going to implement this stuff. May be I am overseeing > something and there are another ways to overcome this problem? Will > you commit such an extension to the mergemaster? While you're hacking on mergemaster, could you please change mergemaster to install files when the files are exactly the same, except for the $FreeBSD$ string? It makes switching to different CVS/SVN branches of the FreeBSD source tree a lot harder. ;-) --=20 Ed Schouten <ed@80386.nl> WWW: http://80386.nl/ --FVcNYgCArjuDqTR+ Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (FreeBSD) iEYEARECAAYFAkpR20QACgkQ52SDGA2eCwWjmACcDSHYDDCijgYYAID3sQAkGAQD ciAAniLOynFvxSFklacHYtC6ntOjc6bA =RbW5 -----END PGP SIGNATURE----- --FVcNYgCArjuDqTR+--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090706110852.GD48776>