From owner-freebsd-hackers@FreeBSD.ORG Tue Oct 1 18:08:59 2013 Return-Path: Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id F3DB6AC4; Tue, 1 Oct 2013 18:08:58 +0000 (UTC) (envelope-from tim@kientzle.com) Received: from monday.kientzle.com (99-115-135-74.uvs.sntcca.sbcglobal.net [99.115.135.74]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D38512D47; Tue, 1 Oct 2013 18:08:57 +0000 (UTC) Received: (from root@localhost) by monday.kientzle.com (8.14.4/8.14.4) id r91I8phV064723; Tue, 1 Oct 2013 18:08:51 GMT (envelope-from tim@kientzle.com) Received: from [192.168.2.123] (CiscoE3000 [192.168.1.65]) by kientzle.com with SMTP id irr7nyvkkxdh5kypr2xsudr29w; Tue, 01 Oct 2013 18:08:51 +0000 (UTC) (envelope-from tim@kientzle.com) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 6.6 \(1510\)) Subject: Re: Is freebsd-update braindamaged, or I'm using it wrong? From: Tim Kientzle In-Reply-To: Date: Tue, 1 Oct 2013 11:08:51 -0700 Content-Transfer-Encoding: quoted-printable Message-Id: <724D26AD-85D5-4AB4-8D47-377AC595ADE7@kientzle.com> References: To: Alexander Yerenkow X-Mailer: Apple Mail (2.1510) Cc: freebsd-hackers , Ivan Voras 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 18:08:59 -0000 Another thing I'd like to see: * Have the tool prompt per-directory first, then per-file. For example: There are 30 changed files in /etc/rc.d. Update all? [y/N] If you hit 'y' it updates all of them right away. If you hit 'N", it = will prompt you for each separate file. Tim On Oct 1, 2013, at 2:38 AM, Alexander Yerenkow = wrote: > 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: >=20 > 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) >=20 > 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) =3D > 0, then you can simply get new file. > Same thing in case that only $FreeBSD$ changed. >=20 > I have some PoC-es for this, but not in shell, maybe I'll come up = someday > with full tool. >=20 >=20 >=20 >=20 > 2013/10/1 Ivan Voras >=20 >> 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: >>=20 >> 1 <<<<<<< current version >> 2 # $FreeBSD: release/9.0.0/etc/gettytab 209954 2010-07-12 19:09:18Z = bcr >> $ >> 3 =3D=3D=3D=3D=3D=3D=3D >> 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 # >>=20 >> 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). >>=20 >> 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. >>=20 >> 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". >>=20 >> 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" >>=20 >=20 >=20 >=20 > --=20 > Regards, > Alexander Yerenkow > _______________________________________________ > 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"