Date: Sun, 03 Jun 2001 22:34:57 -0700 From: Peter Wemm <peter@wemm.org> To: Doug Barton <dougb@FreeBSD.org> Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/usr.sbin/mergemaster mergemaster.sh Message-ID: <20010604053457.DCFD9380E@overcee.netplex.com.au> In-Reply-To: <200106040411.f544BfJ30258@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Doug Barton wrote: > dougb 2001/06/03 21:11:41 PDT > > Modified files: (Branch: RELENG_4) > usr.sbin/mergemaster mergemaster.sh > Log: > MFC 1.19-23, cleanups and clarifications, along with some OpenBSD > compatibility changes. No new functionality. Any chance you will add the hooks to read $Id$ / $FreeBSD$ and pull out the base versions from a local cvs tree for merging with merge(1) some day? mergemaster will be a lot more usable after that as you can tell if you can then let it attempt to do a 3-way merge. It doesn't have to do everything to start with, but it needs to start somewhere so that people can figure out other 'fetch file X rev Y' methods. Cheers, -Peter -- Peter Wemm - peter@FreeBSD.org; peter@yahoo-inc.com; peter@netplex.com.au "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010604053457.DCFD9380E>