Re: pebkac, but is it a mergemaster bug?

From: Ian FREISLICH <ianf_at_clue.co.za>
Date: Mon, 06 Jul 2009 13:18:03 +0200
Ed Schouten wrote:
> * 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. ;-)

I believe that the '-F' option does this.

Ian

--
Ian Freislich
Received on Mon Jul 06 2009 - 09:18:08 UTC

This archive was generated by hypermail 2.4.0 : Wed May 19 2021 - 11:39:51 UTC