From owner-svn-src-all@freebsd.org Tue Aug 23 20:49:57 2016 Return-Path: Delivered-To: svn-src-all@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 5CBADBC4394; Tue, 23 Aug 2016 20:49:57 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pa0-x244.google.com (mail-pa0-x244.google.com [IPv6:2607:f8b0:400e:c03::244]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 27BE912B8; Tue, 23 Aug 2016 20:49:57 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pa0-x244.google.com with SMTP id hh10so10489352pac.1; Tue, 23 Aug 2016 13:49:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=subject:mime-version:from:in-reply-to:date:cc:message-id:references :to; bh=eaMl4+Y/wzdoI7745B1R+mjH1Pat7vDBeXm3uh7fIPw=; b=SJ/Hm9S417fG6r1Ksx7jadf62UgdayEXJPTtqybmx34IGMCsD9Q2aE2fv9eMlav+PJ WAknEDLz+7+bvYRFlJeixip9VbXdlCLqicDheAYr8cqXgNXGDZ10oTLKIVqTqy2vVGVn 2BCcqy0ZFbphzzFsEzyz07z01d1wsa9tQizPCFkwBiJ8QCu8NCyL2o2slM9R2gt88piC 2jAs5Fb1XPPTvaT7vixTfVilGpte+q3+B79J0GCBN3NDUYayfCG8uIhNRAouetcOWhEQ cvxBAB9U6RuAVVknIe0HokHQT5yFZF5e4G+81LZdwiMIT/9JwLQeeUzSKkGnaiGp9lTU Kw7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:mime-version:from:in-reply-to:date:cc :message-id:references:to; bh=eaMl4+Y/wzdoI7745B1R+mjH1Pat7vDBeXm3uh7fIPw=; b=MInykclDuEiVuexAJXIfrd6HBrH4HC1qVMqsquhnc5wtiFfJHvsUpnAclKnVk4azoy ooFEMPNGj1vBEY9VvW2XOL90GXJOsWVzTN7kNfIixa8c+AIFJapscI1pZZ3H91fBEq5O L5/6ORRyKsUu7rwfZ0VzNNfs0eo08CqTP+//LX+F5JwH4iHoEMJChBsU7VCTxTVHSFGr C25Be902trCsrASyJ1UR9PlPbUMldxwD32m+NyM0UDCctsrAEey2C0edjwfXZC8g2OGs eV1X5ut8Af0ptlVLZ4q2VYb+S2TkPjAaKsmFSTG994BE0bC9c4Ox9tDfPlPx7FYG6+FE kxiQ== X-Gm-Message-State: AEkoouuyG8kONguiXQzavexsXV6u2qSkrjT6HTw+tggfV2sEv8yUBhoWPEW4M8kJVjmHSA== X-Received: by 10.66.131.17 with SMTP id oi17mr57509854pab.88.1471985396764; Tue, 23 Aug 2016 13:49:56 -0700 (PDT) Received: from [192.168.20.17] (c-73-19-52-228.hsd1.wa.comcast.net. [73.19.52.228]) by smtp.gmail.com with ESMTPSA id 9sm7862064pfo.74.2016.08.23.13.49.55 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Aug 2016 13:49:55 -0700 (PDT) Subject: Re: svn commit: r304567 - head/sys/dev/usb/input Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\)) Content-Type: multipart/signed; boundary="Apple-Mail=_07A3770D-CA8E-4423-934E-2B275ED4DB41"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Pgp-Agent: GPGMail From: "Ngie Cooper (yaneurabeya)" In-Reply-To: Date: Tue, 23 Aug 2016 13:49:54 -0700 Cc: Bruce Evans , Hans Petter Selasky , Bruce Evans , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-Id: References: <201608211606.u7LG60pS063983@repo.freebsd.org> <20160822185617.I1897@besplex.bde.org> To: Bryan Drewery X-Mailer: Apple Mail (2.3124) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Aug 2016 20:49:57 -0000 --Apple-Mail=_07A3770D-CA8E-4423-934E-2B275ED4DB41 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=windows-1252 > On Aug 23, 2016, at 13:38, Bryan Drewery wrote: =85 > I've written a script to do MFCing with the proper svn merge style for > each branch. It's not perfect but it seems good enough. >=20 > https://people.freebsd.org/~bdrewery/mfc.sh >=20 > It can take multiple revisions. > cd svn/stable/7 > mfc.sh r123 r124 r125 >=20 > It will merge each one at a time, invoke EDITOR for conflicts (SVN = does > this), then opens EDITOR to edit the commit log and saves that to > 'commit'. You can then review and modify the commit as you like and = 'svn > commit -F commit' when done to use the saved commit log. >=20 > If you pass -r to it then it will also prepare an email in mutt to = send > to re@FreeBSD.org for approval to commit. >=20 > It defaults to merging from head, but in the case of wanting to commit > to releng/ you need to pass -b to specify which branch to merge from, > such as -b stable/11 for releng/11.0 commits. I have one that I noted a while back =97 it=92s a bit less featureful, = but it works pretty well IMHO: = https://github.com/yaneurabeya/scratch/blob/master/common/home/ngie/bin/mf= c = https://github.com/yaneurabeya/scratch/blob/master/common/home/ngie/bin/mf= c_log Example usage: ~/mfc ^/head # Do whatever you need to make sure that the commit is ok. svn ci -F commit The only thing it fubars is some of the spacing with some of the commit = messages (I don=92t remember if it was with my commits being MFCed or = other=92s commits being MFCed). I=92m a bit pedantic about formatting -- = that=92s the only reason why I haven=92t posted it up earlier as an = official solution for others to use. Cheers, -Ngie --Apple-Mail=_07A3770D-CA8E-4423-934E-2B275ED4DB41 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJXvLbzAAoJEPWDqSZpMIYVwpMP/3AgNLsHeYKpKr4vGruE9C98 6+codrzWWib1xFe41MEXYCX1VENo20I6f1DrfZzyIuX14zZK3QfBZdV7jkT2jNcE RtEpRlGbEngCdH/MQ9eHCRarInoZviYCRNGHPgBKJyov7Ne9pn+b3aeNpEdcvdek OBflKWPE7eHLlwujX5zEtcIDUHu2WBEvcR6tn4q2Kv1Xg0dTw+t3JjDOsiI0e/xf /86zbxvdefoO5kkIpkyYqNyzc6bUl5WM/FKo34s6iskWUpdsyp72iZgvpACjnif+ DfqmguyMXhUpvwu47t7aqOxLgyK9YCOq/tI21cnByvhnoIltNQ3y+rqg1qLz1vEk 57RRU16trFHUZhap0z/jBV2qPkhgEGflo4vaNQPd+XLMRw5svkoSo6/gNShghDEj zlBuasgowpKV/nZ1xCEiEjEoBEoPMZeTacXM5uWDQQl2j/IADAjhwdvDuiwxTEbu 0NWRHFRAXlqItNIwDPccsqtKZJWd07fKSg1/5Uz+xgHzw6vQvIYGIqkYF8UVEXY6 nc5BzxlvafKi/5tKRg75Ydt5F3StvaX9Cd/ADuFdH97y7il2Z61SDXCbtZC7+HvM jqGx3+qz3cMz0nQr9IBIXGVHKOGAy8L4PUk/L0WxSacsyibCAfdA0mjaahlT5tYm LvCXBDZji/wX/W0ba7VQ =tDi+ -----END PGP SIGNATURE----- --Apple-Mail=_07A3770D-CA8E-4423-934E-2B275ED4DB41--