From owner-freebsd-hackers Tue Feb 4 11: 5:33 2003 Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 87F0A37B401; Tue, 4 Feb 2003 11:05:32 -0800 (PST) Received: from woozle.rinet.ru (woozle.rinet.ru [195.54.192.68]) by mx1.FreeBSD.org (Postfix) with ESMTP id E23BC43F93; Tue, 4 Feb 2003 11:05:30 -0800 (PST) (envelope-from marck@rinet.ru) Received: from localhost (localhost [127.0.0.1]) by woozle.rinet.ru (8.12.5/8.12.5) with ESMTP id h14J5KTJ021300; Tue, 4 Feb 2003 22:05:20 +0300 (MSK) (envelope-from marck@rinet.ru) Date: Tue, 4 Feb 2003 22:05:20 +0300 (MSK) From: Dmitry Morozovsky To: Doug Barton Cc: Garance A Drosihn , Dag-Erling Smorgrav , freebsd-hackers@FreeBSD.ORG Subject: Re: Modifying mergemaster behavior In-Reply-To: <20030203221928.S11438@12-234-22-23.pyvrag.nggov.pbz> Message-ID: <20030204220335.G58217@woozle.rinet.ru> References: <200301281844.h0SIie3G086935@repoman.freebsd.org> <200301281908.h0SJ8OoY028183@apollo.backplane.com> <20030201235429.G77226@12-234-22-23.pyvrag.nggov.pbz> <20030203091128.Y4113@12-234-22-23.pyvrag.nggov.pbz> <20030203221928.S11438@12-234-22-23.pyvrag.nggov.pbz> X-NCC-RegID: ru.rinet MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-freebsd-hackers@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Mon, 3 Feb 2003, Doug Barton wrote: [snip] DB> > -I '$FreeBSD:.*$' DB> > to the 'diff ${DIFF_FLAG}' command in diff_loop, and it seems to have DB> > worked the way I wanted it to work. DB> DB> What do you think mm should do if the only diff between two files is the DB> cvs ID? This comes up inside a branch if a change is checked in, then DB> backed out. Of course, it happens a lot when upgrading from 4 to 5 for DB> example. Moreover, and possibly much more frequent, when upgrading between security branches of -stable, e.g. RELENG_4_6 -> RELENG_4_7 Not that it were major PITA, but avoiding it would simplify our lives ;-) Sincerely, D.Marck [DM5020, DM268-RIPE, DM3-RIPN] ------------------------------------------------------------------------ *** Dmitry Morozovsky --- D.Marck --- Wild Woozle --- marck@rinet.ru *** ------------------------------------------------------------------------ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message