From owner-freebsd-questions@FreeBSD.ORG Tue May 22 01:52:40 2007 Return-Path: X-Original-To: freebsd-questions@freebsd.org Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5FF3D16A41F for ; Tue, 22 May 2007 01:52:40 +0000 (UTC) (envelope-from mikhailg@webanoide.org) Received: from shanshito.webanoide.org (shanshito.webanoide.org [150.101.108.110]) by mx1.freebsd.org (Postfix) with ESMTP id 9F02613C484 for ; Tue, 22 May 2007 01:52:39 +0000 (UTC) (envelope-from mikhailg@webanoide.org) Received: from maxito.hba.navalradio.cl (maxito.hba.navalradio.cl [172.26.4.34]) (authenticated bits=0) by shanshito.webanoide.org (8.13.8/8.13.8) with ESMTP id l4M1qXRw012359 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Tue, 22 May 2007 01:52:37 GMT (envelope-from mikhailg@webanoide.org) Message-ID: <46524CE0.2040501@webanoide.org> Date: Tue, 22 May 2007 11:52:32 +1000 From: Mikhail Goriachev Organization: Webanoide User-Agent: Thunderbird 2.0.0.0 (Macintosh/20070326) MIME-Version: 1.0 To: Andrew Falanga References: <340a29540705211721k1090b5f1rb282b2a4ae870146@mail.gmail.com> In-Reply-To: <340a29540705211721k1090b5f1rb282b2a4ae870146@mail.gmail.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: freebsd-questions Subject: Re: How to retrieve the list of files to merge by hand 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: Tue, 22 May 2007 01:52:40 -0000 Andrew Falanga wrote: > Hi, > > I just upgraded my box here at home last night and I made a little > mistake (fortunately, not one large enough to keep things from > working). I updated my source tree to 6.2-RELEASE-p4 and did the > "make buildworld" and "make buildkernel." Then I dropped to single > user mode to do the installs for both. At the end, as per some > instructions from a friend, I did "mergemaster -i -a". At the end was > quite a long list of files left for me to merge by hand. This was > actually a surprise to me because I'd updated two boxes at work > earlier in the week and the largest number of file to update by hand > was only 2. > > At any rate, because I was in single user mode, and hadn't started > mergemaster with something like, "mergemaster -i -a | tee > merge.output" or something (that's the small mistake that won't happen > again), I don't have the list of files to merge. > > At any rate, with exception to rc.conf and /etc/ttys, I haven't > modified anything the system uses anyway. Is there a way of > retrieving this list? As a side note, in an effort to get this list > (via a pipe command such as the one above), I reran the mergemaster > command, but got a much different set of results. Did I completely > eliminate any chance I had at getting them? Just run mergemaster again: # cd /usr/src # mergemaster That should do it. Regards, Mikhail. -- Mikhail Goriachev Webanoide Telephone: +61 (0)3 62252501 Mobile Phone: +61 (0)4 38255158 E-Mail: mikhailg@webanoide.org Web: www.webanoide.org