Date: Sat, 03 May 2003 00:54:24 +0200 From: Dag-Erling Smorgrav <des@ofug.org> To: Doug Barton <DougB@FreeBSD.org> Cc: cvs-all@FreeBSD.org Subject: Re: cvs commit: src/usr.sbin/mergemaster mergemaster.sh Message-ID: <xzpfznxkli7.fsf@flood.ping.uio.no> In-Reply-To: <20030502152842.Y12694@znfgre.qbhto.arg> (Doug Barton's message of "Fri, 2 May 2003 15:33:49 -0700 (PDT)") References: <200305020626.h426QNT4044532@repoman.freebsd.org> <xzpel3h8l2f.fsf@flood.ping.uio.no> <20030502152842.Y12694@znfgre.qbhto.arg>
next in thread | previous in thread | raw e-mail | index | archive | help
Doug Barton <DougB@FreeBSD.org> writes: > On Fri, 2 May 2003, Dag-Erling Smorgrav wrote: > > How about a more generic mechanism that lists files which exist in > > DESTDIR but not in TEMPROOT and offers to remove / rename them? > mergemaster -v will give you the list. If you actually run that, you'll > see the problem I think. Too many files that actually do belong, but > aren't created by src/etc/Makefile (and therefore mergemaster doesn't > "know" about them). What you could do is the following: **** $DESTDIR/etc/xxxx does not exist in TEMPROOT Use 'd' to delete $DESTDIR/etc/xxxx Use 'k' to keep $DESTDIR/etc/xxx and never ask about it again Default is to leave the file to deal with by hand How should I deal with this? [Leave it for later] then if the user presses 'k', record the file name in the mm rc file and the next time mm trips over it it will be ignored. DES -- Dag-Erling Smorgrav - des@ofug.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?xzpfznxkli7.fsf>