cvs commit: src/usr.sbin/mergemaster mergemaster.sh

[Dag-Erling Smorgrav]

Doug Barton <DougB at 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 at ofug.org