painful binary upgrade from 8.1 to 8.2

When following the instructions at 

  http://www.freebsd.org/releases/8.2R/announce.html

to go from 8.1 to 8.2, I'm presented during the command:

  freebsd-update upgrade -r 8.2-RELEASE

with no less than *** 322 *** files that differ only by the CVS tag.

After hitting about 150 of these with "ret ret ret dd dd dd ret dd : wq
ret", I'm really frustrated, because I made a mistake and now apparently
have to start over.

Why doesn't the freebsd-update command invoke mergemaster with -F?

Or is there some step that I'm leaving out?

-- 
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>
Smalltalk/Perl/Unix consulting, Technical writing, Comedy, etc. etc.
See http://methodsandmessages.posterous.com/ for Smalltalk discussion
_______________________________________________
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to "freebsd-questions-unsubscribe@freebsd.org"