summaryrefslogtreecommitdiffstats
path: root/usr.sbin/mergemaster/mergemaster.sh
Commit message (Expand)AuthorAgeFilesLines
* Revert 184781, 184804, and 184832 (automatic installation of filesdougb2009-01-011-19/+0
* No need to run rm ${COMPFILE} after mm_install() - mm_install()sobomax2008-11-111-1/+0
* Improve on 184781 - instead of ignoring the file when the only differencesobomax2008-11-091-2/+8
* Ignore files that only differ in CVS Id tag.sobomax2008-11-091-0/+14
* Remove ISDN4BSD (I4B) from HEAD as it is not MPSAFE andbz2008-05-261-2/+2
* In the following scenario:dougb2007-12-211-0/+7
* Add auto upgrade capability to mergemaster.gordon2006-04-291-1/+86
* Add a -A argument to mergemaster to allow explicitly specifying anrwatson2006-02-041-7/+11
* Change the default for deleting stale files from yes (which violatesdougb2005-12-211-5/+5
* In the case where /etc/rc.d/ is empty, do not bogusly ask the user ifdougb2004-03-071-1/+1
* Set MAKEOBJDIRPREFIX in the environment, like God intended. Thisru2004-03-061-3/+3
* mergemaster -p (pre-world) doesn't populate /etc/rc.d, which led to adougb2004-01-041-5/+4
* * Update copyrightdougb2004-01-011-2/+51
* Use the actual build target (all), since relying on the build as adougb2003-08-041-0/+1
* Preserve directory structure in PRESERVED_FILES_DIR to avoiddougb2003-05-031-2/+2
* rc.sendmail should not have been removed yet.dougb2003-05-021-2/+2
* * Add a -P (Preserve) option, which saves a copy of files that you replace.dougb2003-05-021-20/+50
* Put back the deletion of TEMPROOT/etc/passwd.dougb2003-03-051-1/+1
* Better handle the recent (desirable) change to create login.conf.db atdougb2003-03-051-4/+4
* * Update copyright year.dougb2003-02-051-5/+6
* Backout last commit by request.dillon2003-01-281-44/+11
* Commit simple mergemaster changes to make the UI more deterministicdillon2003-01-251-11/+44
* Don't use NO_MAKEDEV* option, its the default now.phk2002-10-221-1/+1
* Suppress spurious warning messages about rm -rf TEMPROOT failingdougb2002-08-051-3/+3
* Fix a couple DESTDIR related problems. Credit for the "Only in" sectiondougb2002-08-051-2/+2
* * Handle all flags, not just schgdougb2002-06-301-3/+8
* Add 'chflags -R noschg' to the deletion process for the TEMPROOTdougb2002-06-261-1/+2
* Go back to taking the user's umask into account. Thanks to Alfred fordougb2002-06-101-23/+31
* * Use the new stat(1) to get mode information from the files wedougb2002-06-061-34/+33
* Actually accept the default argument to SCREEN_WIDTH.dougb2002-05-281-0/+3
* * Add some niceties to make the -p option quieter, and better behaveddougb2002-05-041-5/+28
* Solve the problem of spuriously comparing files that were createddougb2002-04-081-0/+3
* Improve grep'ing for variables in make.conf and rc.conf*.dougb2002-02-251-4/+4
* * Add a feature to do a "pre {build|install}world" check of (so far)dougb2002-02-241-26/+90
* * Update (c)dougb2002-02-121-2/+5
* Hopefully squish the problem of mm creating sendmail files indougb2001-08-071-1/+3
* Work around the problem in RELENG_4 where the file doesn't actuallydougb2001-06-201-7/+13
* Add the last of the compatibility mods from openbsd. Neatly, thedougb2001-05-301-9/+14
* Various fixes, including suggestions from some thoughtful folks, thanks.dougb2001-05-281-18/+47
* Be more consistent with the terminology, referring to "temporary anddougb2001-05-281-2/+2
* Fix a problem when user selects -a (auto run) but we encounter a filedougb2001-05-281-1/+16
* Whitespace only changes to try and fit a little better into 80 columns.dougb2001-05-281-15/+20
* Change NO_MAKEDEV to a finer granularity method:asmodai2001-03-291-1/+1
* * Add two requested features, source'ing of /etc/mergemaster.rc, anddougb2001-03-051-15/+58
* * Reduce diffs to RELENG_4 by specifying a full path to sysctldougb2000-11-091-3/+9
* Reorder one of the new features based on experience. Since the numberdougb2000-11-011-12/+12
* Add several new features, reorder some code, and continue with thedougb2000-10-301-91/+136
* More changes that don't modify functionality.dougb2000-10-291-60/+76
* Whitespace only. Make the style of the contributed sections consistent withdougb2000-10-291-133/+134
* Make mergemaster ignore files in /dev if /dev is a devfs.ben2000-08-261-1/+6
OpenPOWER on IntegriCloud