Date: Thu, 12 Mar 2009 14:30:03 +0700 From: Eugene Grosbein <eugen@kuzbass.ru> To: Doug Barton <dougb@freebsd.org> Cc: Andrei Kolu <antik@bsd.ee>, FreeBSD Stable <freebsd-stable@freebsd.org> Subject: Re: mergemaster annoyance or not? Message-ID: <20090312073003.GA81921@svzserv.kemerovo.su> In-Reply-To: <alpine.BSF.2.00.0903120015420.1054@ync.qbhto.arg> References: <49B8AB66.9080408@bsd.ee> <alpine.BSF.2.00.0903120015420.1054@ync.qbhto.arg>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, Mar 12, 2009 at 12:22:19AM -0700, Doug Barton wrote: > What you're seeing is an artifact of the way that CVS deals with cutting a > release. Even though the content of the files is the same, the CVS Id is > updated in the release branch so that you can track revisions to that file > that occur within that branch (e.g., RELENG_6_4), as opposed to the > changes that occur in the parent branch (RELENG_6). This is a feature. I think these days we need (by default) /etc/mergemaster.rc filled in with something like this: DIFF_OPTIONS='-I$FreeBSD:.*[$] -I$NetBSD:.*[$]' IGNORE_FILES='/etc/motd' Else there is lots of annoyance running mergemaster first time and after each release and there will be lots of questions/complains about this. Eugene Grosbein
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090312073003.GA81921>