svn commit: r205246 - stable/7/usr.sbin/mergemaster

Doug Barton dougb at
Wed Mar 17 07:27:00 UTC 2010

Author: dougb
Date: Wed Mar 17 07:26:59 2010
New Revision: 205246

  MFC r205145:
  Make it more clear in the docs that -a is not compatible with -iFU,
  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

Directory Properties:
  stable/7/usr.sbin/mergemaster/   (props changed)

Modified: stable/7/usr.sbin/mergemaster/mergemaster.8
--- stable/7/usr.sbin/mergemaster/mergemaster.8	Wed Mar 17 07:26:00 2010	(r205245)
+++ stable/7/usr.sbin/mergemaster/mergemaster.8	Wed Mar 17 07:26:59 2010	(r205246)
@@ -24,7 +24,7 @@
 .\" $FreeBSD$
-.Dd January 7, 2010
+.Dd March 13, 2010
@@ -32,7 +32,8 @@
 .Nd merge configuration files, et al during an upgrade
-.Op Fl scrvahipFCPU
+.Op Fl scrvhpCP
+.Op Fl a|iFU
 .Op Fl m Ar /path/to/sources
 .Op Fl t Ar /path/to/temp/root
 .Op Fl d
@@ -168,7 +169,7 @@ and therefore can override both files.
 When the comparison is done if there are any files remaining
 in the temproot directory they will be listed, and if the
 .Fl a
-option is not in use the user will be given the option of 
+option is not in use the user will be given the option of
 deleting the temproot directory.
 If there are no files remaining in the temproot directory
 it will be deleted.
@@ -206,9 +207,11 @@ If the
 directory exists, it creates a new one in a previously
 non-existent directory.
 This option unsets the verbose flag,
-but other than
-.Fl U
-it is compatible with all other options.
+and is not compatible with
+.Fl i ,
+.Fl F ,
+.Fl U .
 .Fl a

Modified: stable/7/usr.sbin/mergemaster/
--- stable/7/usr.sbin/mergemaster/	Wed Mar 17 07:26:00 2010	(r205245)
+++ stable/7/usr.sbin/mergemaster/	Wed Mar 17 07:26:59 2010	(r205246)
@@ -15,7 +15,7 @@ PATH=/bin:/usr/bin:/usr/sbin
 display_usage () {
   VERSION_NUMBER=`grep "[$]FreeBSD:" $0 | cut -d ' ' -f 4`
   echo "mergemaster version ${VERSION_NUMBER}"
-  echo 'Usage: mergemaster [-scrvahipFCPU]'
+  echo 'Usage: mergemaster [-scrvhpCP] [-a|[-iFU]]'
   echo '    [-m /path] [-t /path] [-d] [-u N] [-w N] [-A arch] [-D /path]'
   echo "Options:"
   echo "  -s  Strict comparison (diff every pair of files)"
@@ -337,6 +337,18 @@ while getopts ":ascrvhipCPm:t:du:w:D:A:F
+if [ -n "$AUTO_RUN" ]; then
+  if [ -n "$FREEBSD_ID" -o -n "$AUTO_UPGRADE" -o -n "$AUTO_INSTALL" ]; then
+    echo ''
+    echo "*** You have included the -a option along with one or more options"
+    echo '    that indicate that you wish mergemaster to actually make updates'
+    echo '    (-F, -U, or -i), however these options are not compatible.'
+    echo '    Please read mergemaster(8) for more information.'
+    echo ''
+    exit 1
+  fi
 # Assign the location of the mtree database

More information about the svn-src-stable-7 mailing list