| mergemaster.8 (189994) | mergemaster.8 (190320) |
|---|---|
| 1.\" Copyright (c) 1998-2009 Douglas Barton 2.\" All rights reserved. 3.\" 4.\" Redistribution and use in source and binary forms, with or without 5.\" modification, are permitted provided that the following conditions 6.\" are met: 7.\" 1. Redistributions of source code must retain the above copyright 8.\" notice, this list of conditions and the following disclaimer. --- 8 unchanged lines hidden (view full) --- 17.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 18.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 19.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 20.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 21.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 22.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 23.\" SUCH DAMAGE. 24.\" | 1.\" Copyright (c) 1998-2009 Douglas Barton 2.\" All rights reserved. 3.\" 4.\" Redistribution and use in source and binary forms, with or without 5.\" modification, are permitted provided that the following conditions 6.\" are met: 7.\" 1. Redistributions of source code must retain the above copyright 8.\" notice, this list of conditions and the following disclaimer. --- 8 unchanged lines hidden (view full) --- 17.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 18.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 19.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 20.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 21.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 22.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 23.\" SUCH DAMAGE. 24.\" |
| 25.\" $FreeBSD: head/usr.sbin/mergemaster/mergemaster.8 189994 2009-03-18 21:55:08Z dougb $ | 25.\" $FreeBSD: head/usr.sbin/mergemaster/mergemaster.8 190320 2009-03-23 14:42:41Z dougb $ |
| 26.\" 27.Dd March 18, 2009 28.Dt MERGEMASTER 8 29.Os 30.Sh NAME 31.Nm mergemaster 32.Nd merge configuration files, et al during an upgrade 33.Sh SYNOPSIS --- 43 unchanged lines hidden (view full) --- 77files (as appropriate) using 78.Xr sdiff 1 79or leave the file in the temporary root environment to 80merge by hand later. 81.Pp 82By default it creates the temporary root in 83.Pa /var/tmp/temproot 84and compares the | 26.\" 27.Dd March 18, 2009 28.Dt MERGEMASTER 8 29.Os 30.Sh NAME 31.Nm mergemaster 32.Nd merge configuration files, et al during an upgrade 33.Sh SYNOPSIS --- 43 unchanged lines hidden (view full) --- 77files (as appropriate) using 78.Xr sdiff 1 79or leave the file in the temporary root environment to 80merge by hand later. 81.Pp 82By default it creates the temporary root in 83.Pa /var/tmp/temproot 84and compares the |
| 85Version Control System (VCS) Id strings ($FreeBSD: head/usr.sbin/mergemaster/mergemaster.8 189994 2009-03-18 21:55:08Z dougb $) | 85Version Control System (VCS) Id strings ($FreeBSD) |
| 86for files that have them, deleting 87the temporary file if the strings match. 88If there is 89no Id string, or if the strings are different it 90compares the files themselves. 91You can 92also specify that the script ignore the Id strings and 93compare every file with the --- 117 unchanged lines hidden (view full) --- 211destination directory. 212.It Fl p 213Pre-buildworld mode. 214Compares only files known to be essential to the success of 215{build|install}world, 216including 217.Pa /etc/make.conf . 218.It Fl F | 86for files that have them, deleting 87the temporary file if the strings match. 88If there is 89no Id string, or if the strings are different it 90compares the files themselves. 91You can 92also specify that the script ignore the Id strings and 93compare every file with the --- 117 unchanged lines hidden (view full) --- 211destination directory. 212.It Fl p 213Pre-buildworld mode. 214Compares only files known to be essential to the success of 215{build|install}world, 216including 217.Pa /etc/make.conf . 218.It Fl F |
| 219If the files differ only by VCS Id ($FreeBSD: head/usr.sbin/mergemaster/mergemaster.8 189994 2009-03-18 21:55:08Z dougb $) | 219If the files differ only by VCS Id ($FreeBSD) |
| 220install the new file. 221.It Fl C 222After a standard 223.Nm 224run, 225compares your rc.conf[.local] options to the defaults. 226.It Fl P 227Preserve files that you replace in --- 105 unchanged lines hidden (view full) --- 333#DESTDIR= 334# 335# Strict comparison skips the VCS Id test and compares every file 336#STRICT=no 337# 338# Type of diff, such as unified, context, etc. 339#DIFF_FLAG='-u' 340# | 220install the new file. 221.It Fl C 222After a standard 223.Nm 224run, 225compares your rc.conf[.local] options to the defaults. 226.It Fl P 227Preserve files that you replace in --- 105 unchanged lines hidden (view full) --- 333#DESTDIR= 334# 335# Strict comparison skips the VCS Id test and compares every file 336#STRICT=no 337# 338# Type of diff, such as unified, context, etc. 339#DIFF_FLAG='-u' 340# |
| 341# Install the new file if it differs only by VCS Id ($FreeBSD: head/usr.sbin/mergemaster/mergemaster.8 189994 2009-03-18 21:55:08Z dougb $) | 341# Install the new file if it differs only by VCS Id ($FreeBSD) |
| 342#FREEBSD_ID= 343# 344# Verbose mode includes more details and additional checks 345#VERBOSE= 346# 347# Automatically install files that do not exist on the system already 348#AUTO_INSTALL= 349# --- 108 unchanged lines hidden --- | 342#FREEBSD_ID= 343# 344# Verbose mode includes more details and additional checks 345#VERBOSE= 346# 347# Automatically install files that do not exist on the system already 348#AUTO_INSTALL= 349# --- 108 unchanged lines hidden --- |