* Roman Divacky <rdivacky_at_freebsd.org> wrote: > 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. ;-) > > 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_at_80386.nl> WWW: http://80386.nl/
This archive was generated by hypermail 2.4.0 : Wed May 19 2021 - 11:39:51 UTC