summaryrefslogtreecommitdiffstats
path: root/usr.sbin/mergemaster/mergemaster.8
Commit message (Collapse)AuthorAgeFilesLines
* MFC r288381:bdrewery2015-10-021-7/+6
| | | | | All supported releases have the -m support from r186678, so remove the mention of it and reword this a bit to remove 'you'.
* Remove request to email suggestions and fixes to the author.eadler2013-06-241-8/+0
| | | | | | | | He is no longer involved with the FreeBSD project. While here: remove "no known bugs" and related. This isn't present in other manual pages. PR: docs/179914
* 1. Add a new option, --run-updates, to always or never run the newalises,dougb2011-11-021-1/+10
| | | | | | | | | | | | | pwd_mkdb, etc. updates at the end of the comparison. 2. Add an update to the end to handle /etc/localtime, if it exists. If /var/db/zoneinfo exists, automatically update /etc/localtime, which should (hopefully) be safe to do. If not, prompt the user to run tzsetup. 3. Update run_it_now(), the function that handles input for the updates, to make sure that we got a valid answer, and to handle the --run-updates option if supplied.
* Make clear that the -U option can be dangerous. [1]dougb2011-08-091-3/+6
| | | | | | | | | | | In -p mode install the group file with the same permissions as normally done in etc/Makefile. Update the copyright. Requested by: peter [1] Approved by: re (kib)
* mdoc: drop redundant .Pp and .LP callsuqs2010-10-081-1/+0
| | | | They have no effect when coming in pairs, or before .Bl/.Bd
* Make it more clear in the docs that -a is not compatible with -iFU,dougb2010-03-141-6/+9
| | | | | | | | and enforce this in the code. Apparently a lot of users mistakenly combine -a with these flags and are then mystified that no changes were made. While I'm here, fix a trailing space in mergemaster.8
* Use the newly brought %U macro.ru2010-01-151-1/+1
|
* Update copyright datedougb2010-01-081-2/+10
| | | | | | | | | | | Update delete_temproot() to include the error message if it fails, and clean up the places where it's called. If there are no files left in temproot when the comparison is done delete it without prompting. This should make "automated" runs of mergemaster without -a a little easier. Document the new behavior in the man page.
* It's not necessary to include both Op and Fl for command line optionsdougb2009-12-301-9/+11
| | | | | | included in the text, so use only the latter. Clarify that using -U doesn't make sense in combination with -a
* Document the DELETE_STALE_RC_FILES option introduced in r201291. This isdougb2009-12-301-16/+19
| | | | | | | | an "rc file only" option by design. While I'm here, update the comments in the example rc file to indicate which command line options they relate to, and correct the defaults for a couple of options.
* Don't tempt svn to expand the example $FreeBSD stringsdougb2009-03-231-3/+3
|
* 1. Update for new -F option from r189992.dougb2009-03-181-22/+42
| | | | | | | | | | | 2. Sort the command line options to match how they are displayed in usage() 3. Change references to cvs to the more generic "version control system" and remove the .Xr for cvs 4. Consistently use ".Op Fl" to refer to command line options in the text. 5. Only use the apostrophe to indicate possession. 6. Add FREEBSD_ID (-F) to the list of variables in the example rc, and change the DIFF_OPTIONS example to -Bb since -F now covers it.
* Add a note to the -m option indicating that you should now specify src/dougb2009-01-021-1/+9
| | | | instead of src/etc.
* General Improvementsdougb2009-01-011-19/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | ==================== 1. List the command line options in a more standard way 2. Improve the explanations of some of the arguments (-A, -D) 3. Add ARCHSTRING and MTREEDB to the example rc file 4. Re-sort some of the examples according to the existing distinction of "has a command line version" vs. "does not have a command line version" Document changes for r186678 =========================== 1. /usr/src/etc -> /usr/src where needed [1] 2. Add IGNORE_FILES to the example rc [2] (and remove IGNORE_MOTD) 3. Update the EXIT STATUS section for [3] and [4] Update Copyright and .Dd accordingly PR: bin/96528 [1] Submitted by: ru [1] PR: bin/106642 [2] Submitted by: Henrik Brix Andersen <henrik@brixandersen.dk> PR: bin/122282 [3] Submitted by: Eygene Ryabinkin <rea-fbsd@codelabs.ru> [3] PR: bin/108183 [4] Submitted by: Riccardo Torrini <riccardo@torrini.org> [4]
* Document the AUTO_UPGRADE (-U) knob for .mergemasterrcdougb2008-06-111-0/+3
| | | | | Submitted by: mezz No Cookie For: gordon :)
* Add missed SYNOPSIS flag for auto upgrade.gordon2006-04-301-1/+1
| | | | Submitted by: marck at rinet dot ru
* Add auto upgrade capability to mergemaster.gordon2006-04-291-0/+2
| | | | | | | | | | | | | | | | | | | An mtree description of all non-zero files that make distribution installs (only size and md5) is built from the temproot. When the user completes a mergemaster run, the mtree description file gets installed into /var/db for safe-keeping. When the user then decides to do a subsequent upgrade (with the -U flag), the existing mtree description from /var/db is called into service looking for files that are different in DESTDIR. This is stashed away until a file that would normally end up prompting the user to look at changes is encountered. Since there are no user modified changes, the new file is installed without bothering the user. Looked at by: dougb MFC after: 6 weeks
* Add a -A argument to mergemaster to allow explicitly specifying anrwatson2006-02-041-1/+6
| | | | | | | | | architecture to pass through to the underlying makefiles. This is quite useful when building on an i386 box to populate an amd64 NFS root. Head nod: dougb MFC after: 1 week
* Point to the right path under www.freebsd.org/doc for the Handbookkeramida2005-07-201-1/+1
| | | | | | | section on "make world". The old link still works fine, but all the hyperlinks of the referenced document are broken; the same links work find if /doc/en_US.ISO8859-1 is used instead of plain /doc to reach the online Handbook copy.
* Expand contractions.ru2005-02-131-1/+1
|
* Sort sections.ru2005-01-181-34/+34
|
* Added the EXIT STATUS section where appropriate.ru2005-01-171-1/+1
|
* Mechanically kill hard sentence breaks.ru2004-07-021-3/+7
|
* * Document the -P optiondougb2003-05-021-1/+17
| | | | | | * Add a paragraph suggesting that the merge option be used only for files that users have modified. People have been using this option for all files that are different, causing unecessary confusion.
* Try another solution for not expanding a CVS tag.dougb2003-02-271-1/+1
| | | | Submitted by: roam
* Try to fix two problems with the -I example. One is the fact that wedougb2003-02-101-1/+1
| | | | | | | want to match a character $, not EOL. The other is that CVS helpfully expanded my example into an actual CVS tag. Submitted by: gad
* * Update copyright year.dougb2003-02-051-2/+5
| | | | * Add an example that ignores CVS Id tags for the new DIFF_OPTIONS variable.
* Correct links to Handbook's pages, old URLs does not work anymore.blackend2002-07-301-1/+1
| | | | MFC after: 1 week
* The .Nm utilitycharnier2002-07-141-6/+10
|
* * Fix a small typo, thanks to olgenidougb2002-05-041-1/+4
| | | | * Document the COMP_CONFS variable in the .mergemasterrc example
* Document the two new options, pre buildworld mode anddougb2002-04-081-1/+12
| | | | post-mm rc.conf[.local] comparisons.
* * Update (c)dougb2002-02-121-1/+3
| | | | | * Expand on the definition of the -s (strict) option, at the suggestion of Gary W. Swearingen, swear@blarg.net.
* mdoc(7) police: removed HISTORY info from the .Os call.ru2001-07-101-1/+1
|
* mdoc(7) police: remove extraneous .Pp before and/or after .Sh.dd2001-07-091-2/+0
|
* mdoc(7) police:ru2001-07-051-6/+7
| | | | | | | | | | Use -tag list in the FILES section to work around the bug when .Pa font is not restored to its original value if one of the -hang, -ohang, or -inset lists is used in the FILES section. (The fix for the bug has just been submitted to the GNU Groff maintainers.) Also, fixed the Handbook reference in the SEE ALSO.
* Clarify handling of /etc/mergemaster.rc and $HOME/.mergemasterrcdougb2001-05-281-1/+6
|
* mdoc(7) police: normalize .Nd.ru2001-04-181-1/+1
|
* * Add two requested features, source'ing of /etc/mergemaster.rc, anddougb2001-03-051-2/+8
| | | | | | | | | | | | | | asking the user to actually run the recommended commands related to installation of files such as aliases or login.conf. * Return to using grep for CVS $Id comparison. Using ident caused too many problems for people with local CVS/RCS tags in their stuff. Attempt to make portability a little easier to maintain in spite of this change by defining the name of the tag to search for. This is a slightly different change that solves the problem in the PR. PR: bin/24564 Submitted by: Tony Finch <dot@dotat.at>
* Prepare for mdoc(7)NG.ru2000-12-271-4/+3
|
* mdoc(7) police: use the new features of the Nm macro.ru2000-11-201-1/+1
|
* mdoc(7) police: use certified section headers wherever possible.ru2000-11-171-1/+1
|
* Use Fx macro wherever possible.ru2000-11-141-1/+2
|
* * Reduce diffs to RELENG_4 by specifying a full path to sysctldougb2000-11-091-1/+1
| | | | | | | | | | | | | | | * Adjust a little whitespace * Make the distrib-dirs/mtree on DESTDIR conditional on user actually specifying a DESTDIR. This seemed like a safe way to get the right directories and permissions in the installed tree since 'make installworld' does the same thing, but in practice too many people have custom hacks that we should leave unmolested. Still need to find a way to deal with 'install -d' and permissions on nonexistent directories in the middle of the path, but this is at least no worse that it was before. PR: bin/22661
* Add several new features, reorder some code, and continue with thedougb2000-10-301-6/+58
| | | | | | | | | | | | | | | | | | | | | | | | | process of making the script more cross platform friendly. * Add -i option to automatically install files that do not exist on the system already. * Add the ability to specify DESTDIR. * Allow the user to specify scripts to run right before the comparison starts, and when mm is done. This will allow the user to specify customized local behavior, and implement features such as automatically deleting files. * Document the above changes in the man page. * Switch to using 'ident' for the CVS Id comparison, which should help with portability, and makes it faster. * Reorder, and in one case fix some code by doing things in ways that make more sense. * Check to see if the file exists on the system before doing the comparisons. This saves CPU cycles, and streamlines the auto-install process. I used bits and pieces of suggestions and patches from various people, ultimately too numerous to name. Which is not to say that they were not both appreciated, and helpful in achieving the ultimate result.
* Update copyrightdougb2000-10-291-1/+1
|
* Update link to Making the World tutorial (now in the handbook)marko2000-08-071-2/+2
|
* Remove single-space hard sentence breaks. These degrade the qualitysheldonh2000-03-011-23/+46
| | | | | of the typeset output, tend to make diffs harder to read and provide bad examples for new-comers to mdoc.
* Add IGNORE_MOTD to allow the sysadmin to ignore (likely) differences inbillf1999-10-261-0/+2
| | | | | | the FreeBSD default motd and the system motd Submitted by: author
* freebsd -> FreeBSDbillf1999-10-261-1/+1
|
* Add $FreeBSD$billf1999-10-261-2/+1
| | | | Submitted by: chris
OpenPOWER on IntegriCloud