From arundel@h3c.de  Sun Nov  7 22:40:58 2004
Return-Path: <arundel@h3c.de>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6C1B716A4E4
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  7 Nov 2004 22:40:56 +0000 (GMT)
Received: from defiant4.noxa.de (defiant.noxa.de [212.60.197.41])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B860143D2D
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  7 Nov 2004 22:40:53 +0000 (GMT)
	(envelope-from arundel@h3c.de)
Received: (qmail 30005 invoked from network); 7 Nov 2004 23:40:46 +0100
Received: from pd95351c7.dip.t-dialin.net (HELO skatecity.) (217.83.81.199)
  by defiant.noxa.de with AES256-SHA encrypted SMTP; 7 Nov 2004 23:40:46 +0100
Received: from skatecity. (freebsd@skatecity. [127.0.0.1])
	by skatecity. (8.13.1/8.13.1) with ESMTP id iA7Mk3DK063496
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 7 Nov 2004 23:46:03 +0100 (CET)
	(envelope-from arundel@skatecity)
Received: (from arundel@localhost)
	by skatecity. (8.13.1/8.13.1/Submit) id iA7Mk3vm063490;
	Sun, 7 Nov 2004 23:46:03 +0100 (CET)
	(envelope-from arundel)
Message-Id: <200411072246.iA7Mk3vm063490@skatecity.>
Date: Sun, 7 Nov 2004 23:46:03 +0100 (CET)
From: No Name <arundel@h3c.de>
Reply-To: No Name <arundel@h3c.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Mergemaster on 4x -> 5.x pre-buildworld
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         73651
>Category:       bin
>Synopsis:       Mergemaster on 4x -> 5.x pre-buildworld
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    dougb
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 07 22:50:13 GMT 2004
>Closed-Date:    Wed Oct 12 00:35:13 GMT 2005
>Last-Modified:  Tue Jul 27 16:33:32 UTC 2010
>Originator:     Alexander Best
>Release:        FreeBSD 4.10-STABLE i386
>Organization:
>Environment:
System: FreeBSD skatecity 4.10-STABLE FreeBSD 4.10-STABLE #0: Wed Sep 22 22:34:56 CEST 2004 arundel@skatecity:/usr/obj/usr/src/sys/ARUNDEL i386

>Description:
	I just tried doing a `mergemaster -p` to prepair for installing FBSD 5.3 over
	my FBSD 4.10 installation. As usual mergemaster compares the essential files
	(including the nologin issue described in the manual). However the script fails
	on the default/example make.conf. Since the file got moved from /etc/default to
	share/examples/etc, mergemaster wasn't able to compare the differences between that
	file and my /etc/make.conf.
>How-To-Repeat:
	Using FBSD 4.10: `mergemaster -p`
>Fix:
	Either commit a new mergemaster script to RELENG_4. However I don't think that this
	will be of any help, since only very few people will be updating their world to
	RELENG_4 and after that to RELENG_5_3. Another way would be to change the mergemaster
	script that comes with 5.3 to provide a backward compatibility with 4.x. In order
	for people to use this method the 5.3 Source Upgrade manual had to be changed from
	saying `mergemaster -p' to '/usr/src/usr.sbin/mergemaster/mergemaster.sh -p`
	I think this solution was also proposed back then to people updating to 4.x from a
	FBSD that did't come with a mergemaster script.
	The last option I can think of is to simply put a modified mergemaster script from
	RELENG_4 into the main RELENG_5_3 source directory. Again the doc had to be changed
	to tell people which mergemaster script to use.

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: dougb 
State-Changed-When: Wed Oct 12 00:33:18 GMT 2005 
State-Changed-Why:  

What you've described is accurate. There are (at least) two 
possible solutions. First, use and/or install the mergemaster 
from 5.x. Second, instead of trying to do a source upgrade 
over major versions, back up your important data, and 
reinstall from scratch. This is especially useful in the 
4->5  upgrade since without a newfs on the filesystems 
you miss out on the benefits of UFS2.  

hope this helps, 

Doug 


Responsible-Changed-From-To: freebsd-bugs->dougb 
Responsible-Changed-By: dougb 
Responsible-Changed-When: Wed Oct 12 00:33:18 GMT 2005 
Responsible-Changed-Why:  

I maintain mergemaster 

http://www.freebsd.org/cgi/query-pr.cgi?pr=73651 
>Unformatted:
