Date: Tue, 23 Sep 2003 14:56:50 -0600 (MDT) From: "M. Warner Losh" <imp@bsdimp.com> To: dwhite@gumbysoft.com Cc: aga@rsm.ru Subject: Re: About mergemaster Message-ID: <20030923.145650.93652894.imp@bsdimp.com> In-Reply-To: <20030923092434.U86981@carver.gumbysoft.com> References: <3F6F0A0C.1060308@rsm.ru> <20030923143459.GS37152@nasby.net> <20030923092434.U86981@carver.gumbysoft.com>
next in thread | previous in thread | raw e-mail | index | archive | help
In message: <20030923092434.U86981@carver.gumbysoft.com>
Doug White <dwhite@gumbysoft.com> writes:
: On Tue, 23 Sep 2003, Jim C. Nasby wrote:
:
: > I think a far better solution would be to give mergemaster the ability
: > to compare files to the version in CVS as reported by the $FreeBSD$ tag.
:
: In 99% of cases, there is no CVS repo to compare against.
I just wish there was a mode that would manage the FreeBSD files as a
vendor branch and merge my local changes as a new vendor branch import
happens...
Warner
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030923.145650.93652894.imp>