Date: Mon, 06 Jul 2009 13:18:03 +0200 From: Ian FREISLICH <ianf@clue.co.za> To: Ed Schouten <ed@80386.nl> Cc: dougb@freebsd.org, Eygene Ryabinkin <rea-fbsd@codelabs.ru>, current@freebsd.org Subject: Re: pebkac, but is it a mergemaster bug? Message-ID: <E1MNmCx-0001PO-Fv@clue.co.za> In-Reply-To: <20090706110852.GD48776@hoeg.nl> References: <20090706110852.GD48776@hoeg.nl> <E1MNOcw-0001uh-K3@clue.co.za> <JihCfvLYurSbwCvYPMTikKEUsuo@OeoW5JVkL3r5Dz%2BLWqlFPl5E0fc>
next in thread | previous in thread | raw e-mail | index | archive | help
Ed Schouten wrote: > * 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. ;-) I believe that the '-F' option does this. Ian -- Ian Freislich
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1MNmCx-0001PO-Fv>