Date: Mon, 6 Jul 2009 15:31:04 +0400 From: Eygene Ryabinkin <rea-fbsd@codelabs.ru> To: Ed Schouten <ed@80386.nl> Cc: Ian Freislich <ianf@clue.co.za>, current@freebsd.org, dougb@freebsd.org Subject: Re: pebkac, but is it a mergemaster bug? Message-ID: <edKea2AEcfqDw8zYRtbIKcL4VB8@OeoW5JVkL3r5Dz%2BLWqlFPl5E0fc> In-Reply-To: <20090706110852.GD48776@hoeg.nl> References: <E1MNOcw-0001uh-K3@clue.co.za> <JihCfvLYurSbwCvYPMTikKEUsuo@OeoW5JVkL3r5Dz%2BLWqlFPl5E0fc> <20090706110852.GD48776@hoeg.nl>
next in thread | previous in thread | raw e-mail | index | archive | help
Ed, good day.
Mon, Jul 06, 2009 at 01:08:52PM +0200, Ed Schouten wrote:
> 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. ;-)
It's 'mergemaster -F'.
--
Eygene
_ ___ _.--. #
\`.|\..----...-'` `-._.-'_.-'` # Remember that it is hard
/ ' ` , __.--' # to read the on-line manual
)/' _/ \ `-_, / # while single-stepping the kernel.
`-'" `"\_ ,_.-;_.-\_ ', fsc/as #
_.-'_./ {_.' ; / # -- FreeBSD Developers handbook
{_.-``-' {_/ #
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?edKea2AEcfqDw8zYRtbIKcL4VB8>