Date: Wed, 14 Mar 2001 20:31:46 +1030 From: Matthew Thyer <thyerm@camtech.net.au> To: Brian Somers <brian@Awfulhak.org> Cc: Martin Blapp <mb@imp.ch>, current@FreeBSD.ORG Subject: Re: Proposal to mergemaster Message-ID: <3AAF418A.B817275D@camtech.net.au> References: <200103140137.f2E1bZa10327@hak.lan.Awfulhak.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Brian Somers wrote: > 3. Have a cvs-aware option. > > If the installed and new version numbers differ, mergemaster does a > cvs diff -u -rINSTALLEDVERSION newversion | patch INSTALLEDFILE. If > this works, everyone's happy. If not, it forces you to modify the > new file 'till there are no <<<<< >>>>> bits in it. > Yes yes yes. Many people using mergemaster have the Repo on hand at $CVSROOT so this should be an option if not the default (when $CVSROOT is defined). For those who dont I suppose a directory could keep the unmodified versions of the currently installed files that mergemaster updates. Or maybe the versions could be fetched from the web (from cvsweb ?) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3AAF418A.B817275D>