From owner-freebsd-hackers@FreeBSD.ORG Tue Oct 1 09:38:16 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 14E4886A; Tue, 1 Oct 2013 09:38:16 +0000 (UTC) (envelope-from yerenkow@gmail.com) Received: from mail-pd0-x22b.google.com (mail-pd0-x22b.google.com [IPv6:2607:f8b0:400e:c02::22b]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DDA562BA4; Tue, 1 Oct 2013 09:38:15 +0000 (UTC) Received: by mail-pd0-f171.google.com with SMTP id g10so6955385pdj.2 for ; Tue, 01 Oct 2013 02:38:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=JdfY57nuZ+qO0rDkO09lf4Gp4QvPlIzCqrkldQEAvOE=; b=jj51hoj7ySo3eG6RPLGQTPwitmc5Jihiuit3gZEwb6he8DO6zqV30p5H96upIktmcS TPneR/hbTnwW0IBzLoRcjYdVV0C9k7NR47dC0FMQxZ1n1mKNOeo3BcXeMiuFcsX37z+o nIZvq6e0//wcoc5fLzxQzlE1d43DbT3tnPidGJl8B6siVnpAXlrRPfiD3CCpEswX6yI2 +Nf4SXxMl+JHq2cyLQkN3KGfmtfDf4DK7hXKIh5/ZQmScSf+jlKsZNQU+ggxV+CGLxAz SMroAq24Xnasor0SoDJi8hFPXbpfJkh993t9dBsN50UfcYpv8+IuqyMBq68+OKPtwAU5 PZLw== MIME-Version: 1.0 X-Received: by 10.66.149.73 with SMTP id ty9mr32168051pab.36.1380620295477; Tue, 01 Oct 2013 02:38:15 -0700 (PDT) Received: by 10.68.84.167 with HTTP; Tue, 1 Oct 2013 02:38:15 -0700 (PDT) In-Reply-To: References: Date: Tue, 1 Oct 2013 12:38:15 +0300 Message-ID: Subject: Re: Is freebsd-update braindamaged, or I'm using it wrong? From: Alexander Yerenkow To: Ivan Voras Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.14 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:38:16 -0000 To make better tool (than current behaviour of mergemaster regarding configs/source files) which could make merge an easy task it *must* have such things: a) way to get Original configs/files from revision from you are upgrading ($Rev1) b) way to get Original configs/files from revision to you are upgrading ($Rev100) c) have ability to ignore differencies in comments d) have ability to treat special cases (as $FreeBSD$ - just took newer line) Then, your each new file will be $Rev100 + diff_changes(CURRENT, $Rev1) + diff_changes($Rev100, $Rev1). Note, that in case that your diffs are none diff_changes(CURRENT, $Rev1) = 0, then you can simply get new file. Same thing in case that only $FreeBSD$ changed. I have some PoC-es for this, but not in shell, maybe I'll come up someday with full tool. 2013/10/1 Ivan Voras > 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? > _______________________________________________ > 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" > -- Regards, Alexander Yerenkow