From owner-freebsd-stable@freebsd.org Fri Aug 14 06:32:07 2015 Return-Path: Delivered-To: freebsd-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B6D9D9B7AAB for ; Fri, 14 Aug 2015 06:32:07 +0000 (UTC) (envelope-from ari@ish.com.au) Received: from mail13.tpgi.com.au (mail13.tpgi.com.au [203.12.160.181]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "*.tpg.com.au", Issuer "RapidSSL SHA256 CA - G3" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 33DFE1C63 for ; Fri, 14 Aug 2015 06:32:06 +0000 (UTC) (envelope-from ari@ish.com.au) X-TPG-Junk-Checked: Yes X-TPG-Junk-Status: score=1.3 tests=RDNS_NONE X-TPG-Junk-Level: * X-TPG-Antivirus: Passed X-TPG-Abuse: host=[202.161.115.54]; ip=202.161.115.54; date=Fri, 14 Aug 2015 15:58:42 +1000 Received: from fish.ish.com.au (202-161-115-54.static.tpgi.com.au [202.161.115.54] (may be forged)) by mail13.tpgi.com.au (envelope-from ari@ish.com.au) (8.14.3/8.14.3) with ESMTP id t7E5weVY031980 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 14 Aug 2015 15:58:42 +1000 Received: from ip-136.ish.com.au ([203.29.62.136]:65348) by fish.ish.com.au with esmtpsa (TLSv1.2:DHE-RSA-AES128-SHA:128) (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1ZQ80j-0005pB-1s for freebsd-stable@freebsd.org; Fri, 14 Aug 2015 15:58:38 +1000 X-CTCH-RefID: str=0001.0A090202.55CD838D.00CC:SCFSTAT29393324, ss=1, re=-4.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0 To: freebsd-stable From: Aristedes Maniatis Subject: merging commiter headers X-Enigmail-Draft-Status: N1110 Message-ID: <55CD838C.4000109@ish.com.au> Date: Fri, 14 Aug 2015 15:58:36 +1000 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:40.0) Gecko/20100101 Thunderbird/40.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Aug 2015 06:32:07 -0000 I've just upgraded three machines from 10.1 to 10.2. Congratulations on the release... This was one of the worst upgrade experiences in my FreeBSD history, going back to 4.0 days. I used freebsd-update but I was absolutely swamped with merging the svn (nee cvs) headers in roughly 80 files. <<<<<<< current version # $FreeBSD: release/10.0.0/etc/periodic/security/800.loginfail 254974 2013-08-27 21:20:28Z jlh $ ======= # $FreeBSD: releng/10.2/etc/periodic/security/800.loginfail 263661 2014-03-23 12:58:48Z brueffer $ >>>>>>> 10.2-RELEASE Let's leave aside why users would care what commit number, date or user last touched this file. Let's assume that you don't need a header to tell you the path of the file you are looking at. And let's leave aside why release is now releng (are we saving bytes?). And let's leave aside why the diff shows an upgrade from 10.0 to 10.2 when actually this was from 10.1 to 10.2. Can't some merge tool inside freebsd-update just sort this out for me? Please? Not only does it take over 45 minutes to go through all those files, but I feel sure I missed something. Ari -- --------------------------> Aristedes Maniatis ish http://www.ish.com.au Level 1, 30 Wilson Street Newtown 2042 Australia phone +61 2 9550 5001 fax +61 2 9550 4001 GPG fingerprint CBFB 84B4 738D 4E87 5E5C 5EFA EF6A 7D2E 3E49 102A