From owner-freebsd-hackers@FreeBSD.ORG Tue Oct 1 09:17:05 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 A2D6C1DD for ; Tue, 1 Oct 2013 09:17:05 +0000 (UTC) (envelope-from ivoras@gmail.com) Received: from mail-we0-x234.google.com (mail-we0-x234.google.com [IPv6:2a00:1450:400c:c03::234]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 427E829FC for ; Tue, 1 Oct 2013 09:17:05 +0000 (UTC) Received: by mail-we0-f180.google.com with SMTP id u57so6833693wes.39 for ; Tue, 01 Oct 2013 02:17:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:from:date:message-id:subject:to:content-type; bh=9WDb1ApYNY0oqgR0ddWYkq/3kfj9920FmSCNS+ExQrE=; b=r/rlwqgL4AUDBg9tIzYSjr9Gxv+ohLvEhIRl737ZdGOou8r2ZK7p98pel2B3+44Rhk 5bZqm7oL2rGIrV/TGV+zbbhgE49w6CptFGKPqYgLXGj7giDSg1RB2uGk2qqJcVYzwvAm a4sgcQ78a6LAxBoUVpbZJs9qdBMeFSAXyvRIimgVi9s5+DTPqvsAbfu734F6OGx8Cdtq GD0n1KWL3oBGB1MBfQZJznnz0g6YyaU9Xyp3msQbS66lQ4Kt06TQ4/RJ60w+LoMrMBtH wShV+p14S6CKSzs4O8BKvQ6T0wnSqXrkk33kbJKc7S1VIItdylzP41gbznSoGyK+rCaP YCLg== X-Received: by 10.180.210.243 with SMTP id mx19mr17432737wic.35.1380619023155; Tue, 01 Oct 2013 02:17:03 -0700 (PDT) MIME-Version: 1.0 Sender: ivoras@gmail.com Received: by 10.216.169.133 with HTTP; Tue, 1 Oct 2013 02:16:22 -0700 (PDT) From: Ivan Voras Date: Tue, 1 Oct 2013 11:16:22 +0200 X-Google-Sender-Auth: JBA5nWRqoe68GXoaDDsWIdebZDQ Message-ID: Subject: Is freebsd-update braindamaged, or I'm using it wrong? To: freebsd-hackers Content-Type: text/plain; charset=UTF-8 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:17:05 -0000 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?