pebkac, but is it a mergemaster bug?

[Erik Trulsson]

On Mon, Jul 06, 2009 at 01:08:52PM +0200, Ed Schouten wrote:
> Hi Eygene,
> 
> * Eygene Ryabinkin <rea-fbsd at 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. ;-)

Isn't that exactly what the '-F' flag for mergemaster already does?



-- 
<Insert your favourite quote here.>
Erik Trulsson
ertr1013 at student.uu.se