From owner-freebsd-hackers@FreeBSD.ORG Tue Oct 1 09:37:22 2013 Return-Path: Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 5CCCD75E; Tue, 1 Oct 2013 09:37:22 +0000 (UTC) (envelope-from vince@unsane.co.uk) Received: from unsane.co.uk (unsane-pt.tunnel.tserv5.lon1.ipv6.he.net [IPv6:2001:470:1f08:110::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CB25B2B8A; Tue, 1 Oct 2013 09:37:21 +0000 (UTC) Received: from vhoffman.lon.namesco.net (lon.namesco.net [195.7.254.102]) (authenticated bits=0) by unsane.co.uk (8.14.7/8.14.6) with ESMTP id r919bIsM054469 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO); Tue, 1 Oct 2013 10:37:19 +0100 (BST) (envelope-from vince@unsane.co.uk) Message-ID: <524A97CD.50003@unsane.co.uk> Date: Tue, 01 Oct 2013 10:37:17 +0100 From: Vincent Hoffman User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:17.0) Gecko/20130801 Thunderbird/17.0.8 MIME-Version: 1.0 To: Ivan Voras Subject: Re: Is freebsd-update braindamaged, or I'm using it wrong? References: In-Reply-To: X-Enigmail-Version: 1.5.2 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: freebsd-hackers X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Oct 2013 09:37:22 -0000 On 01/10/2013 10:16, Ivan Voras wrote: > This is the first time I've used freebsd-update in years, and I'm > immediately flagging it as something I won't use in the future. For > the last half hour it has been forcing me to manually resolve, one by > one, in an editor, hundreds of "merge conflicts" such as these: > > 1 <<<<<<< current version > 2 # $FreeBSD: release/9.0.0/etc/gettytab 209954 2010-07-12 19:09:18Z bcr $ > 3 ======= > 4 # $FreeBSD: release/9.2.0/etc/gettytab 243623 2012-11-27 19:23:54Z peterj $ > 5 >>>>>>> 9.2-RELEASE > 6 # from: @(#)gettytab 5.14 (Berkeley) 3/27/91 > 7 # > > This is fairly ridiculous. Then, at a random file it has proposed its > own merge and asked the prompt "Does this look reasonable?". It was > not, but when I answered it with "n" it stopped the whole process > (instead of maybe opening the file in the editor for me to merge > again). > > I've since retried the process and it behaves the same, and then tried > it on another system and again - the same type of manual merges and > the same exit from the process when answering "n" to a botched merge. > > In both cases, I'm upgrading from either 9.0-RELEASE or 9.1-RELEASE to > 9.2-RELEASE and the command line was "freebsd-update upgrade -r > 9.2-RELEASE". > > Am I doing something wrong, or is freebsd-update simply quirky and not > that useful? It is a little quirky, you arent the first to note this. For example http://freebsd.1045724.n5.nabble.com/Should-I-be-able-to-use-mergemaster-with-freebsd-update-td5822457.html "not that useful?" is subjective, some machines I've used it on happily, I'm more likely to build and use mergemaster though. Vince > _______________________________________________ > freebsd-hackers@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-hackers > To unsubscribe, send any mail to "freebsd-hackers-unsubscribe@freebsd.org"