pebkac, but is it a mergemaster bug?

[Ed Schouten]

* 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/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-current/attachments/20090706/e81db4f2/attachment.pgp