Date: Tue, 4 Feb 2003 22:05:20 +0300 (MSK) From: Dmitry Morozovsky <marck@rinet.ru> To: Doug Barton <DougB@FreeBSD.ORG> Cc: Garance A Drosihn <drosih@rpi.edu>, Dag-Erling Smorgrav <des@ofug.org>, freebsd-hackers@FreeBSD.ORG Subject: Re: Modifying mergemaster behavior Message-ID: <20030204220335.G58217@woozle.rinet.ru> In-Reply-To: <20030203221928.S11438@12-234-22-23.pyvrag.nggov.pbz> References: <200301281844.h0SIie3G086935@repoman.freebsd.org> <p05200f24ba5c8412dcd1@[128.113.24.47]> <200301281908.h0SJ8OoY028183@apollo.backplane.com> <p05200f26ba5c85ee4c77@[128.113.24.47]> <20030201235429.G77226@12-234-22-23.pyvrag.nggov.pbz> <xzpy94xa6fb.fsf@flood.ping.uio.no> <20030203091128.Y4113@12-234-22-23.pyvrag.nggov.pbz> <p05200f4cba64ed4989d3@[128.113.24.47]> <20030203221928.S11438@12-234-22-23.pyvrag.nggov.pbz>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030204220335.G58217>