Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 5F142200CDE for ; Tue, 8 Aug 2017 16:10:56 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 5D865167525; Tue, 8 Aug 2017 14:10:56 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id A3A6C16751E for ; Tue, 8 Aug 2017 16:10:55 +0200 (CEST) Received: (qmail 99594 invoked by uid 500); 8 Aug 2017 14:10:54 -0000 Mailing-List: contact dev-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list dev@hbase.apache.org Received: (qmail 99583 invoked by uid 99); 8 Aug 2017 14:10:54 -0000 Received: from mail-relay.apache.org (HELO mail-relay.apache.org) (140.211.11.15) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Aug 2017 14:10:54 +0000 Received: from mail-io0-f169.google.com (mail-io0-f169.google.com [209.85.223.169]) by mail-relay.apache.org (ASF Mail Server at mail-relay.apache.org) with ESMTPSA id BB6AD1A0048 for ; Tue, 8 Aug 2017 14:10:53 +0000 (UTC) Received: by mail-io0-f169.google.com with SMTP id j32so14153233iod.0 for ; Tue, 08 Aug 2017 07:10:52 -0700 (PDT) X-Gm-Message-State: AHYfb5iAhRwxu4JCH8f3/BL4fsm+9z5FaFKy1t8VOB0t+j1Qd3sJ/463 m+L4/IDtc0kwPXhtAdNoVuA/CHAPtA== X-Received: by 10.107.10.212 with SMTP id 81mr3857410iok.317.1502201451546; Tue, 08 Aug 2017 07:10:51 -0700 (PDT) MIME-Version: 1.0 Received: by 10.2.151.214 with HTTP; Tue, 8 Aug 2017 07:10:51 -0700 (PDT) Received: by 10.2.151.214 with HTTP; Tue, 8 Aug 2017 07:10:51 -0700 (PDT) In-Reply-To: References: From: Sean Busbey Date: Tue, 8 Aug 2017 09:10:51 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: DISCUSS: How can we have less branches? To: dev Content-Type: multipart/alternative; boundary="001a113f909ae6c10c05563e875a" archived-at: Tue, 08 Aug 2017 14:10:56 -0000 --001a113f909ae6c10c05563e875a Content-Type: text/plain; charset="UTF-8" Are we approaching this problem wrong though? Most of the cherry picks I have to do to the maintenance release lines are clean. What if we get more tooling to help with the everything-goes-right case? My last read of asf policy and infra folks (from back in the website automation) is they won't look favorably on Jenkins pushing back ports into our repo. But! We could make something similar to the website job from back when a committer still had to do the git push. A nightly job that tries to cherry pick and gives us a set of back ports that worked. We could either have it look to jira for fix versions to try backporting to, or we could have it try everything and update jira with what worked. Thoughts? On Aug 8, 2017 02:14, "Stack" wrote: > (This came up during dev meeting in Shenzhen) We are running too many > branches and/or when applying patches, we do not do a good job backporting > to all active branches, especially fixes. > > We have master, branch-2, branch-1, branch-1.4, branch-1.3, branch-1.2, and > branch-1.1 active currently. If a dirty bug fix, the applier is backporting > to 7 branches. It takes a while applying to all especially if the backport > doesn't go in clean. I suppose the RM could monitor all upstream of them > and then pull wanted patches back (we could do that too) but seems like a > burden on an RMer. > > We should EOL a few? > > Nick is on branch-1.1 release at the moment. Perhaps this could be the last > off branch-1.1. > > 1.2 hosts our current stable release though 1.3 is out. How about we cut a > release off 1.3, call it stable, and then EOL 1.2 after another release or > so? > > What you all think? > > Thanks, > S > --001a113f909ae6c10c05563e875a--