Date: Fri, 9 Jan 2009 11:20:51 +0000 (UTC) From: Doug Barton <dougb@FreeBSD.org> To: cvs-src-old@freebsd.org Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.8 mergemaster.sh Message-ID: <200901091121.n09BL80a017529@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
dougb 2009-01-09 11:20:51 UTC FreeBSD src repository Modified files: (Branch: RELENG_7) usr.sbin/mergemaster mergemaster.8 mergemaster.sh Log: SVN rev 186937 on 2009-01-09 11:20:51Z by dougb MFC the changes from r179725, documentation of the AUTO_UPGRADE knob, and 186677:186749: o Removal of 184781, 184804, and 184832 (automatic installation of files that differ only by VCS Id) o Fix cross-platform builds o Various improvements to the mtree (-U) feature o Remove the last of the MAKEDEV stuff o Switch to using the top level (e.g., /usr/src) Makefile, and specify that we should use the *.mk files from the source directory instead of the installed versions. o Check for the deprecated 'nodev' option in /etc/fstab o Add support for the IGNORE_FILES variable o Before installing a file check to make sure that the target does not already exist as a directory o Check to be sure that the file installed and error out if not o We only need to check for the presence of the target of $PAGER if that variable is actually set Revision Changes Path 1.36.2.1 +42 -19 src/usr.sbin/mergemaster/mergemaster.8 1.54.2.2 +94 -52 src/usr.sbin/mergemaster/mergemaster.sh
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200901091121.n09BL80a017529>