Date: Mon, 23 Mar 2009 14:54:01 +0000 (UTC) From: Doug Barton <dougb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org Subject: svn commit: r190322 - stable/6/usr.sbin/mergemaster Message-ID: <200903231454.n2NEs1NO012519@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dougb Date: Mon Mar 23 14:54:01 2009 New Revision: 190322 URL: http://svn.freebsd.org/changeset/base/190322 Log: MFC 190320, don't expand example $FreeBSD strings Modified: stable/6/usr.sbin/mergemaster/ (props changed) stable/6/usr.sbin/mergemaster/mergemaster.8 stable/6/usr.sbin/mergemaster/mergemaster.sh Modified: stable/6/usr.sbin/mergemaster/mergemaster.8 ============================================================================== --- stable/6/usr.sbin/mergemaster/mergemaster.8 Mon Mar 23 14:53:21 2009 (r190321) +++ stable/6/usr.sbin/mergemaster/mergemaster.8 Mon Mar 23 14:54:01 2009 (r190322) @@ -82,7 +82,7 @@ merge by hand later. By default it creates the temporary root in .Pa /var/tmp/temproot and compares the -Version Control System (VCS) Id strings ($FreeBSD$) +Version Control System (VCS) Id strings ($FreeBSD) for files that have them, deleting the temporary file if the strings match. If there is @@ -216,7 +216,7 @@ Compares only files known to be essentia including .Pa /etc/make.conf . .It Fl F -If the files differ only by VCS Id ($FreeBSD$) +If the files differ only by VCS Id ($FreeBSD) install the new file. .It Fl C After a standard @@ -338,7 +338,7 @@ with all values commented out: # Type of diff, such as unified, context, etc. #DIFF_FLAG='-u' # -# Install the new file if it differs only by VCS Id ($FreeBSD$) +# Install the new file if it differs only by VCS Id ($FreeBSD) #FREEBSD_ID= # # Verbose mode includes more details and additional checks Modified: stable/6/usr.sbin/mergemaster/mergemaster.sh ============================================================================== --- stable/6/usr.sbin/mergemaster/mergemaster.sh Mon Mar 23 14:53:21 2009 (r190321) +++ stable/6/usr.sbin/mergemaster/mergemaster.sh Mon Mar 23 14:54:01 2009 (r190322) @@ -26,7 +26,7 @@ display_usage () { echo " -h Display more complete help" echo ' -i Automatically install files that do not exist in destination directory' echo ' -p Pre-buildworld mode, only compares crucial files' - echo ' -F Install files that differ only by revision control Id ($FreeBSD$)' + echo ' -F Install files that differ only by revision control Id ($FreeBSD)' echo ' -C Compare local rc.conf variables to the defaults' echo ' -P Preserve files that are overwritten' echo " -U Attempt to auto upgrade files that have not been user modified"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200903231454.n2NEs1NO012519>