Date: Mon, 6 Jul 2009 13:14:03 +0200 From: Ed Schouten <ed@80386.nl> To: Roman Divacky <rdivacky@freebsd.org> Cc: Ian Freislich <ianf@clue.co.za>, Eygene Ryabinkin <rea-fbsd@codelabs.ru>, current@freebsd.org, dougb@freebsd.org Subject: Re: pebkac, but is it a mergemaster bug? Message-ID: <20090706111403.GE48776@hoeg.nl> In-Reply-To: <20090706111107.GA19818@freebsd.org> References: <E1MNOcw-0001uh-K3@clue.co.za> <JihCfvLYurSbwCvYPMTikKEUsuo@OeoW5JVkL3r5Dz%2BLWqlFPl5E0fc> <20090706110852.GD48776@hoeg.nl> <20090706111107.GA19818@freebsd.org>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] * Roman Divacky <rdivacky@freebsd.org> wrote: > On Mon, Jul 06, 2009 at 01:08:52PM +0200, Ed Schouten wrote: > > 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. ;-) > > there's mergemaster -F Ooh. Thanks! I just ran `mergemaster -U' and hoped it would do the right thing. I think it would be expected behaviour if -U implied -F... -- Ed Schouten <ed@80386.nl> WWW: http://80386.nl/ [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (FreeBSD) iEYEARECAAYFAkpR3HsACgkQ52SDGA2eCwXiuwCfX8GzPnl6VZE4Tf2XOT5wOsO+ pzAAn1fKdyhSjldh7CXzZFyRFmjVH35r =Cmfn -----END PGP SIGNATURE-----help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090706111403.GE48776>