Issue With 7.0-Rel -> 7.1-Rel Update

[Vince Sabio]

Hi folks,

I am updating an AMD-based machine from v7.0-RELEASE to v7.1-RELEASE. 
Here's what I get:

================BEGIN:
ares-root# freebsd-update upgrade -r 7.1-RELEASE
Looking up update.FreeBSD.org mirrors... 2 mirrors found.
Fetching metadata signature for 7.0-RELEASE from update2.FreeBSD.org... done.
Fetching metadata index... done.
Inspecting system... done.

The following components of FreeBSD seem to be installed:
kernel/generic src/base src/bin src/contrib src/crypto src/etc src/games
src/gnu src/include src/krb5 src/lib src/libexec src/release src/sbin
src/secure src/share src/sys src/ubin src/usbin world/base world/dict
world/doc world/games world/info world/manpages world/proflibs

The following components of FreeBSD do not seem to be installed:
src/cddl src/compat src/rescue src/tools world/catpages

Does this look reasonable (y/n)? y

Fetching metadata signature for 7.1-RELEASE from update2.FreeBSD.org... done.
Fetching metadata index... done.
Fetching 1 metadata patches. done.
Applying metadata patches... done.
Fetching 1 metadata files... done.
Inspecting system... done.
Fetching files from 7.0-RELEASE for merging... done.
Preparing to download files...
done.
Fetching 14771 patches.....[snip snip snip]... done.
Applying patches... done.
Fetching 21632 files... gunzip: (stdin): unexpected end of file
21ca797afb693c5ee108f0c9a617760501cb749b9592603dc16e089acf2be70f has 
incorrect hash.
ares-root#
================END

Weird. But hey, I'm an optimist (and it was 2:00 a.m.), so I figured 
WTF, I'll try it again....

================BEGIN:
ares-root# freebsd-update upgrade -r 7.1-RELEASE
Looking up update.FreeBSD.org mirrors... 2 mirrors found.
Fetching metadata signature for 7.0-RELEASE from update2.FreeBSD.org... done.
Fetching metadata index... done.
Fetching 1 metadata patches. done.
Applying metadata patches... done.
Fetching 1 metadata files... done.
Inspecting system... done.

The following components of FreeBSD seem to be installed:
kernel/generic src/base src/bin src/contrib src/crypto src/etc src/games
src/gnu src/include src/krb5 src/lib src/libexec src/release src/sbin
src/secure src/share src/sys src/ubin src/usbin world/base world/dict
world/doc world/games world/info world/manpages world/proflibs

The following components of FreeBSD do not seem to be installed:
src/cddl src/compat src/rescue src/tools world/catpages

Does this look reasonable (y/n)? y

Fetching metadata signature for 7.1-RELEASE from update2.FreeBSD.org... done.
Fetching metadata index... done.
Fetching 1 metadata patches. done.
Applying metadata patches... done.
Fetching 1 metadata files... done.
Inspecting system... done.
Fetching files from 7.0-RELEASE for merging... done.
Preparing to download files... done.
Fetching 10796 patches.....10....20....30. done.
Applying patches... done.
Fetching 18821 files... done.
Attempting to automatically merge changes in files... done.

The following file could not be merged automatically: /etc/amd.map
Press Enter to edit this file in vi and resolve the conflicts
manually...
================END

Okay, I reach that point and press Enter, and I am presented with a 
diff-style file in vi (which is fine; I'm a vi user) that clearly 
highlights the differences between the current file and v7.1-R file. 
I'm good to go with the v7.1-R version, so I edit out the 'current' 
section, remove the 'diff' markers, ZZ, and that file is done.

The updater then presents me with another file whose changes could 
not be merged automatically. So I go through the identical process.

Wash, rinse, repeat, FOR [more than] FORTY MINUTES' worth of files. 
Each time, I kept thinking, "Okay, this has to be the last one..," 
but it wasn't. Even after 40 minutes, the process was not completed 
-- I just threw in the towel. For all I know, this process could have 
continued for all 21632 files -- version 11.5-RELEASE could have been 
out by the time I finished that process.

So, first of all, what did I do wrong?

Second, when I start the upgrade over again, what should I do differently?

And, if all else fails: In each case of editing the files, the v7.1 
version was fine. Is there any way to tell it, "I have good backups, 
and want to live dangerously, so Just Do It, and don't ask me if I 
want to edit anything..."?

Muchas gracias....

__________________________________________________________________________
Vince Sabio                                                  vince at vjs.org