FTP Search

Directory

Content Search

mergemaster

/Main/OpenBSD/4.1/sh/

aids with merging configuration files during an upgrade The mergemaster script is designed to aid you in updating the various configuration and other files associated with OpenBSD. The script produces a temporary root environment using /usr/src/etc/Makefile which builds the temporary directory structure from / down, then populates that environment with the various files. It then compares each file in that environment to its installed counterpart. When the script finds a change in the new file, or there is no installed version of the new file it gives you four options to deal with it. You can install the new file as is, delete the new file, merge the old and new files (as appropriate) using sdiff(1) or leave the file in the temporary root environment to merge by hand later.

Maintainer: Christian Weisgerber <naddy@openbsd.org>

Info:

Homepage:	-
Package version:	-
Architecture:	sh
Distribution:	OpenBSD 4.1
Filename:	mergemaster-1.46p2.tgz

Browse inside mergemaster-1.46p2.tgz:

pkg://mergemaster-1.46p2.tgz:12081/  downloads

[DIR]sbin/  65535+ twin directories
[DIR]man/  65535+ twin directories
842 B  2007-03-12+DESC  view  85 mirrors
374 B  2007-03-12+CONTENTS  view  512+ mirrors

Download mergemaster-1.46p2.tgz:

2006-10-01  ftp://ftp.uni-hannover.de/pub/mirror/bsd/OpenBSD/4.2/packages/sh/mergemaster-1.46p2.tgz
2006-10-01  ftp://ftp.uni-hannover.de/pub/mirror/bsd/OpenBSD/4.2/packages/arm/mergemaster-1.46p2.tgz
2006-10-01  ftp://ftp.wu-wien.ac.at/pub/systems/OpenBSD/4.2/packages/sh/mergemaster-1.46p2.tgz
2006-10-01  ftp://ftp.wu-wien.ac.at/pub/systems/OpenBSD/4.2/packages/arm/mergemaster-1.46p2.tgz
2006-03-10  ftp://ftp.wu-wien.ac.at/pub/systems/OpenBSD/4.1/packages/arm/mergemaster-1.46p2.tgz
2006-03-10  ftp://ftp.wu-wien.ac.at/pub/systems/OpenBSD/4.1/packages/hppa/mergemaster-1.46p2.tgz
2006-03-20  ftp://ftp.wu-wien.ac.at/pub/systems/OpenBSD/4.1/packages/mips64/mergemaster-1.46p2.tgz
2006-03-16  ftp://ftp.wu-wien.ac.at/pub/systems/OpenBSD/4.1/packages/powerpc/mergemaster-1.46p2.tgz
2006-03-10  ftp://ftp.wu-wien.ac.at/pub/systems/OpenBSD/4.1/packages/sh/mergemaster-1.46p2.tgz
2006-10-01  ftp://ftp.wh2.tu-dresden.de/pub/mirrors/openbsd/4.2/packages/sh/mergemaster-1.46p2.tgz
2006-10-01  ftp://ftp.wh2.tu-dresden.de/pub/mirrors/openbsd/4.2/packages/arm/mergemaster-1.46p2.tgz
2007-05-12  ftp://ftp.swin.edu.au/openbsd/snapshots/packages/sh/mergemaster-1.46p2.tgz
2007-09-02  ftp://ftp.swin.edu.au/openbsd/snapshots/packages/arm/mergemaster-1.46p2.tgz
2006-10-01  ftp://ftp.swin.edu.au/openbsd/4.2/packages/arm/mergemaster-1.46p2.tgz
2006-10-01  ftp://ftp.swin.edu.au/openbsd/4.2/packages/sh/mergemaster-1.46p2.tgz
2005-03-04  ftp://ftp.kd85.com/pub/OpenBSD/3.9/packages/amd64/mergemaster-1.46p2.tgz
2005-09-23  ftp://ftp.kd85.com/pub/OpenBSD/4.0/packages/amd64/mergemaster-1.46p2.tgz
2005-09-23  ftp://ftp.kd85.com/pub/OpenBSD/4.0/packages/i386/mergemaster-1.46p2.tgz
2005-09-23  ftp://ftp.kd85.com/pub/OpenBSD/4.0/packages/powerpc/mergemaster-1.46p2.tgz
2006-03-20  ftp://ftp.kd85.com/pub/OpenBSD/4.1/packages/mips64/mergemaster-1.46p2.tgz
2006-03-16  ftp://ftp.kd85.com/pub/OpenBSD/4.1/packages/powerpc/mergemaster-1.46p2.tgz
2006-03-10  ftp://ftp.kd85.com/pub/OpenBSD/4.1/packages/sh/mergemaster-1.46p2.tgz
2006-10-01  ftp://ftp.kd85.com/pub/OpenBSD/4.2/packages/arm/mergemaster-1.46p2.tgz
2006-10-01  ftp://ftp.kd85.com/pub/OpenBSD/4.2/packages/sh/mergemaster-1.46p2.tgz
2006-03-10  ftp://ftp.kd85.com/pub/OpenBSD/4.1/packages/hppa/mergemaster-1.46p2.tgz
2006-03-10  ftp://ftp.kd85.com/pub/OpenBSD/4.1/packages/arm/mergemaster-1.46p2.tgz
2006-10-01  ftp://ftp.de.openbsd.org/pub/OpenBSD/4.2/packages/sh/mergemaster-1.46p2.tgz
2006-10-01  ftp://ftp.de.openbsd.org/pub/OpenBSD/4.2/packages/arm/mergemaster-1.46p2.tgz
2005-09-23  ftp://ftp.urc.ac.ru/pub/OS/OpenBSD/4.0/packages/mergemaster-1.46p2.tgz
2005-09-23  ftp://ftp.rt.mipt.ru/pub/OpenBSD/4.0/packages/i386/mergemaster-1.46p2.tgz
2005-09-23  ftp://ftp.krokus.ru/pub/OpenBSD/4.0/packages/powerpc/mergemaster-1.46p2.tgz
2005-03-04  ftp://ftp.krokus.ru/pub/OpenBSD/3.9/packages/amd64/mergemaster-1.46p2.tgz
2006-03-20  ftp://ftp.krokus.ru/pub/OpenBSD/4.1/packages/mips64/mergemaster-1.46p2.tgz
2006-03-15  ftp://ftp.krokus.ru/pub/OpenBSD/4.1/packages/powerpc/mergemaster-1.46p2.tgz
2006-03-10  ftp://ftp.krokus.ru/pub/OpenBSD/4.1/packages/sh/mergemaster-1.46p2.tgz
2005-09-23  ftp://ftp.krokus.ru/pub/OpenBSD/4.0/packages/amd64/mergemaster-1.46p2.tgz
2005-09-23  ftp://ftp.krokus.ru/pub/OpenBSD/4.0/packages/i386/mergemaster-1.46p2.tgz
2006-09-30  ftp://ftp.krokus.ru/pub/OpenBSD/4.2/packages/sh/mergemaster-1.46p2.tgz
2006-03-10  ftp://ftp.krokus.ru/pub/OpenBSD/4.1/packages/arm/mergemaster-1.46p2.tgz
2006-03-10  ftp://ftp.krokus.ru/pub/OpenBSD/4.1/packages/hppa/mergemaster-1.46p2.tgz
2006-09-30  ftp://ftp.krokus.ru/pub/OpenBSD/4.2/packages/arm/mergemaster-1.46p2.tgz
2006-10-01  ftp://ftp.calyx.nl/pub/OpenBSD/4.2/packages/arm/mergemaster-1.46p2.tgz
2006-10-01  ftp://ftp.calyx.nl/pub/OpenBSD/4.2/packages/sh/mergemaster-1.46p2.tgz
2006-03-10  ftp://ftp.calyx.nl/pub/OpenBSD/4.1/packages/arm/mergemaster-1.46p2.tgz
2006-03-10  ftp://ftp.calyx.nl/pub/OpenBSD/4.1/packages/hppa/mergemaster-1.46p2.tgz
2006-03-20  ftp://ftp.calyx.nl/pub/OpenBSD/4.1/packages/mips64/mergemaster-1.46p2.tgz
2006-03-16  ftp://ftp.calyx.nl/pub/OpenBSD/4.1/packages/powerpc/mergemaster-1.46p2.tgz
2006-03-10  ftp://ftp.calyx.nl/pub/OpenBSD/4.1/packages/sh/mergemaster-1.46p2.tgz
2005-09-23  ftp://ftp.calyx.nl/pub/OpenBSD/4.0/packages/i386/mergemaster-1.46p2.tgz
2005-09-23  ftp://ftp.calyx.nl/pub/OpenBSD/4.0/packages/powerpc/mergemaster-1.46p2.tgz