From owner-freebsd-questions Sat Oct 26 17: 2:26 2002 Delivered-To: freebsd-questions@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7D6F937B401 for ; Sat, 26 Oct 2002 17:02:25 -0700 (PDT) Received: from www.clubplus.net (ns1.clubplus.net [216.191.22.194]) by mx1.FreeBSD.org (Postfix) with ESMTP id A6CDE43E42 for ; Sat, 26 Oct 2002 17:02:18 -0700 (PDT) (envelope-from david@skytrackercanada.com) Received: from skytrackercanada.com (cust29.209.188.66.dsl.accessv.com [209.188.66.29]) by www.clubplus.net (8.11.4/8.11.1) with ESMTP id g9QNun304596 for ; Sat, 26 Oct 2002 19:57:12 -0400 Received: (from david@localhost) by skytrackercanada.com (8.12.3/8.12.3) id g9QNov5M024274 for questions@freebsd.org; Sat, 26 Oct 2002 19:50:57 -0400 (EDT) (envelope-from david) Date: Sat, 26 Oct 2002 19:50:56 -0400 From: David Banning To: questions@freebsd.org Subject: mergemaster question Message-ID: <20021026195056.A11787@skytrackercanada.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG I am just in the process of upgrading from 4.5S to 4.7 and I will be running mergemaster. One thing I notice using mergemaster is that it seems to take such a long time. Is there a quicker way? It wants to replace alot of files, and that's OK for me 95% of the time. Only a few I want to keep or merge. Am I missing something, or is it just a part of upgrading that you must decide, file by file which will be modified or replaced? To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message