Date: Thu, 1 May 2003 23:26:23 -0700 (PDT) From: Doug Barton <dougb@FreeBSD.org> To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.sh Message-ID: <200305020626.h426QNT4044532@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
dougb 2003/05/01 23:26:23 PDT
FreeBSD src repository
Modified files:
usr.sbin/mergemaster mergemaster.sh
Log:
* Add a -P (Preserve) option, which saves a copy of files that you replace.
The idea for this option came from Marc Schneiders <marc@schneiders.org>
* I've been meaning to remove the code that checked for the existence of
/etc/sysconfig for a while now, since that file was last seen in 2.2.2.
* Replace the above with a check for elements of the old rc system.
Offer to move these files out of DESTDIR/etc for the user's convenience.
Revision Changes Path
1.44 +50 -20 src/usr.sbin/mergemaster/mergemaster.sh
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200305020626.h426QNT4044532>