Date: Tue, 23 Jan 2001 06:10:02 -0800 (PST) From: Tony Finch <dot@dotat.at> To: freebsd-bugs@FreeBSD.org Subject: Re: bin/24564: local ident strings interfere with mergemaster Message-ID: <200101231410.f0NEA2g43164@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR bin/24564; it has been noted by GNATS. From: Tony Finch <dot@dotat.at> To: Josef Karthauser <joe@tao.org.uk> Cc: FreeBSD-gnats-submit@FreeBSD.ORG Subject: Re: bin/24564: local ident strings interfere with mergemaster Date: Tue, 23 Jan 2001 13:59:48 +0000 Josef Karthauser <joe@tao.org.uk> wrote: >On Mon, Jan 22, 2001 at 11:24:00PM +0000, Tony Finch wrote: >> >> This problem can be avoided by ignoring extra ident strings in the >> destination file, and instead only checking that all the ident strings >> in the source file are present in the destination file. > >Or using a different tag instead of $FreeBSD$, in your local >repository. In this case mergemaster will do exactly the right >thing :). No that doesn't work for me. I use $Header$ so that my cvs repository is maximally portable. In fact I haven't done any configuration of it beyond `cvs init` and I don't need to do any more than that for a personal repository. Tony. -- f.a.n.finch fanf@covalent.net dot@dotat.at "Perhaps on your way home you will pass someone in the dark, and you will never know it, for they will be from outer space." To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200101231410.f0NEA2g43164>