bin/73651: Mergemaster on 4x -> 5.x pre-buildworld

[No Name]

>Number:         73651
>Category:       bin
>Synopsis:       Mergemaster on 4x -> 5.x pre-buildworld
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 07 22:50:13 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     No Name
>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 at 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:
>Unformatted: