From owner-freebsd-questions@FreeBSD.ORG Sun Nov 6 19:25:34 2011 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 957A61065675 for ; Sun, 6 Nov 2011 19:25:34 +0000 (UTC) (envelope-from merlyn@stonehenge.com) Received: from mail.mroute.net (lax-gw09.mailroute.net [199.89.0.109]) by mx1.freebsd.org (Postfix) with ESMTP id 7F99C8FC13 for ; Sun, 6 Nov 2011 19:25:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by lax-gw09.mroute.net (Postfix) with ESMTP id 814671700E3 for ; Sun, 6 Nov 2011 19:25:32 +0000 (GMT) X-Virus-Scanned: by MailRoute Received: from red.stonehenge.com (red.stonehenge.com [208.79.95.2]) by lax-gw09.mroute.net (Postfix) with ESMTP id B0A111700CD for ; Sun, 6 Nov 2011 19:25:31 +0000 (GMT) Received: by red.stonehenge.com (Postfix, from userid 1001) id 961AE699D; Sun, 6 Nov 2011 11:25:30 -0800 (PST) From: merlyn@stonehenge.com (Randal L. Schwartz) To: x-mayan-date: Long count = 12.19.18.15.9; tzolkin = 9 Muluc; haab = 17 Zac Date: Sun, 06 Nov 2011 11:25:30 -0800 Message-ID: <867h3ddped.fsf@red.stonehenge.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: painful binary upgrade from 8.1 to 8.2 X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 19:25:34 -0000 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 Smalltalk/Perl/Unix consulting, Technical writing, Comedy, etc. etc. See http://methodsandmessages.posterous.com/ for Smalltalk discussion