NOTICE: This package no longer exists in Ports


./sysutils/mergemaster [aids with merging configuration files during an upgrade]

[ CVSweb ] [ Homepage ] [ RSS feed ]

Version: 1.46p2, Package name: mergemaster-1.46p2
Maintained by: Christian Weisgerber
Master sites:
Description
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.


MD5: tlYF+pBVFzY9QTjDg+m/lA=
RMD160: XCM+vsVef2Yqdu52Y7MBMjP0qnA=
Filesize: 12.312 KB

Package available on: cdrom(), ftp()
Distfile available on: cdrom(), ftp()

Version History (View Complete History)
  • (2008-08-21) Package deleted from Ports
  • (2006-07-21) Package added to openports.se, version mergemaster-1.46p2 (created)
[show/hide] View available PLISTS (Can be a lot of data)

CVS Commit History:

   2008-08-20 09:04:19 by Christian Weisgerber | Files touched by this commit (6)
Log message:
superseded by sysmerge(8)
   2008-08-20 09:04:19 by Christian Weisgerber | Files touched by this commit (6)
Log message:
superseded by sysmerge(8)
   2008-08-20 09:04:19 by Christian Weisgerber | Files touched by this commit (6)
Log message:
superseded by sysmerge(8)
   2008-08-20 09:04:19 by Christian Weisgerber | Files touched by this commit (6)
Log message:
superseded by sysmerge(8)
   2008-08-20 09:04:19 by Christian Weisgerber | Files touched by this commit (6)
Log message:
superseded by sysmerge(8)
   2008-08-20 09:04:19 by Christian Weisgerber | Files touched by this commit (6)
Log message:
superseded by sysmerge(8)
   2008-05-08 08:59:49 by Christian Weisgerber | Files touched by this commit (1)
Log message:
mergemaster has been superseded by sysmerge(8)
   2007-09-15 15:14:03 by Michael Erdely | Files touched by this commit (110)
Log message:
Remove surrounding quotes in COMMENT-*/PERMIT_*/IGNORE
   2007-04-05 11:26:27 by Marc Espie | Files touched by this commit (815)
Log message:
more base64 checksums


   2006-10-21 03:42:32 by Christian Weisgerber | Files touched by this commit (4)
Log message:
move distfiles from dying machine
   2005-12-27 14:58:44 by Christian Weisgerber | Files touched by this commit (2)
Log message:
use system sdiff, drop GNU diff dependency


   2005-12-27 14:58:44 by Christian Weisgerber | Files touched by this commit (2)
Log message:
use system sdiff, drop GNU diff dependency


   2005-11-22 11:36:00 by Christian Weisgerber | Files touched by this commit (2)
Log message:
/.profile and /.cshrc have stopped being hard links, don't special case


   2005-11-22 11:36:00 by Christian Weisgerber | Files touched by this commit (2)
Log message:
/.profile and /.cshrc have stopped being hard links, don't special case


   2005-01-05 10:29:43 by Christian Weisgerber | Files touched by this commit (94)
Log message:
SIZE


   2004-09-15 12:39:34 by Marc Espie | Files touched by this commit (72)
Log message:
new plists


   2004-02-01 12:48:14 by Christian Weisgerber | Files touched by this commit (1)
Log message:
mark package as arch independent


   2003-07-23 13:12:18 by Christian Weisgerber | Files touched by this commit (2)
Log message:
sdiff is gone, but we still need it


   2003-07-23 13:12:18 by Christian Weisgerber | Files touched by this commit (2)
Log message:
sdiff is gone, but we still need it


   2003-05-17 13:39:31 by Christian Weisgerber | Files touched by this commit (1)
Log message:
install files with proper permissions (was 000 before); from grange@


   2003-05-13 14:40:04 by Christian Weisgerber | Files touched by this commit (1)
Log message:
Oops.  Fix a fatal typo and ignore aliases.db.


   2003-05-12 15:54:32 by Christian Weisgerber | Files touched by this commit (4)
Log message:
Catch up with 14 months worth of changes in the FreeBSD version.


   2003-05-12 15:54:32 by Christian Weisgerber | Files touched by this commit (4)
Log message:
Catch up with 14 months worth of changes in the FreeBSD version.


   2003-05-12 15:54:32 by Christian Weisgerber | Files touched by this commit (4)
Log message:
Catch up with 14 months worth of changes in the FreeBSD version.


   2003-05-12 15:54:32 by Christian Weisgerber | Files touched by this commit (4)
Log message:
Catch up with 14 months worth of changes in the FreeBSD version.


   2002-12-29 13:19:12 by Federico G. Schwindt | Files touched by this commit (83)
Log message:
and more..