Date: Mon, 6 Jul 2009 13:11:07 +0200 From: Roman Divacky <rdivacky@freebsd.org> To: Ed Schouten <ed@80386.nl> 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: <20090706111107.GA19818@freebsd.org> In-Reply-To: <20090706110852.GD48776@hoeg.nl> References: <E1MNOcw-0001uh-K3@clue.co.za> <JihCfvLYurSbwCvYPMTikKEUsuo@OeoW5JVkL3r5Dz%2BLWqlFPl5E0fc> <20090706110852.GD48776@hoeg.nl>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090706111107.GA19818>