From owner-freebsd-ports@freebsd.org Sun Apr 23 15:21:44 2017 Return-Path: Delivered-To: freebsd-ports@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 8A25FD4C47E for ; Sun, 23 Apr 2017 15:21:44 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: from mailman.ysv.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 6586E150 for ; Sun, 23 Apr 2017 15:21:44 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: by mailman.ysv.freebsd.org (Postfix) id 64DDED4C47D; Sun, 23 Apr 2017 15:21:44 +0000 (UTC) Delivered-To: ports@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 648A6D4C47C for ; Sun, 23 Apr 2017 15:21:44 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: from mail-it0-x22d.google.com (mail-it0-x22d.google.com [IPv6:2607:f8b0:4001:c0b::22d]) (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 344C014E for ; Sun, 23 Apr 2017 15:21:44 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: by mail-it0-x22d.google.com with SMTP id b134so1678093iti.1 for ; Sun, 23 Apr 2017 08:21:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:reply-to:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=3O7pfdBJqwVTdDBAqu62YaqzffUNY2T7MJkH/dBE5/k=; b=F7XmcgJNMHU4dGWs88pCv2GVt/4kMl/p4Rp+EB8cgP/dhPLueFf3mv3chyWA+8EFzO qzlIx12Js0QOUHqIeDdAfEfxOnn/Z+tbI+Xk0g+xyil0bqj/mpYS8//+SgqcTW95SYr5 WTOTNebjNI6TKAFwMQes6NvaApH5YKNieMyqeFxhW4DKKiW6a/FJT7F9XemX0pJeCry1 4v8AfdIAwbKRmohxrly3Ssr4tQWBkCiex9DIgWLOJHlap4lkYkEBW54qRIuxF6onJxui QWj7Bn//Mhhy551jNkB7pNzKxOL7lIcEFmHaUsxdjfHXii1vLcBgxtibTP6xXYkpAo2V Q1Vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:reply-to:subject:to:references:from :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=3O7pfdBJqwVTdDBAqu62YaqzffUNY2T7MJkH/dBE5/k=; b=ce8UpU5BDJcdJODWW2NInkaao5MCudXHTrz1gQhWoeLpCMZKx2ScTH9GK4IjGxkUFq ht9IaJA4AnXROz7Dz0x6dkZ/JMltqiYZZQ3A+NF1MlIVnsx+W+9jbV6EdqcmwwbE5GOr NAEQyO/9jWKBbt6rll899cxc6nKuGnIROB4VUsbHmPtO+ehYKtud8AtPN3NYlW4IK/1O dyGl9A6EdUKdPCobjiMpytOUvBJ9jEu2zN+S6Gf2Tv5drCOPzI9gCKpgN7pchmK7x26M rW9HJszY93GZsK/vTCKxwd9hIo6hwvfdmzrQxrkNo10Q3i++W3IJvt2FpDybJQOypOv3 udng== X-Gm-Message-State: AN3rC/74D3v9IWZT+eGTCvfHD7TW5WgHb+HSiLKkiYEzb16DQXscfkSC FxpAf1l4Z7kBl5r0qNU= X-Received: by 10.99.114.22 with SMTP id n22mr20442640pgc.163.1492960903194; Sun, 23 Apr 2017 08:21:43 -0700 (PDT) Received: from ?IPv6:2001:44b8:31ae:7b01:2042:3e8:d7ce:9b9c? (2001-44b8-31ae-7b01-2042-03e8-d7ce-9b9c.static.ipv6.internode.on.net. [2001:44b8:31ae:7b01:2042:3e8:d7ce:9b9c]) by smtp.gmail.com with ESMTPSA id 73sm26021605pfj.31.2017.04.23.08.21.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Apr 2017 08:21:42 -0700 (PDT) Sender: Kubilay Kocak Reply-To: koobs@FreeBSD.org Subject: Re: PR merge-quarterly flag To: qjail1 , "ports@FreeBSD.org" References: <58FCAF42.2090102@a1poweruser.com> From: Kubilay Kocak Message-ID: Date: Mon, 24 Apr 2017 01:17:49 +1000 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:54.0) Gecko/20100101 Thunderbird/54.0a2 MIME-Version: 1.0 In-Reply-To: <58FCAF42.2090102@a1poweruser.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-AU Content-Transfer-Encoding: 7bit X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Apr 2017 15:21:44 -0000 On 4/23/17 11:42 PM, qjail1 wrote: > I submitted a PR to update a port I maintain and I selected the > merge-quarterly flag with a ? [question mark]. > > I see the updated version is now in the pkg "latest" repo, but it's not > in the pkg "quarterly" repo yet. > > How long should it take before the merge into "quarterly" happens? > If the issue has been closed already, re-open it with a comment "Pending merge to quarterly request/commit" and cc ports-secteam The original committer that made the change to HEAD (hopefully also the Assignee of the issue) should always respond to the merge-quarterly request (?) prior to resolving, either by: 1) Cancelling (unsetting) the flag with a comment outlining why a merge is not suitable/appropriate/possible, or 2) Setting it to + after the merge has been made, ideally referencing the same "PR: " in the merge commit log message. As far as 'timing' goes, commits to HEAD and subsequent merges to the quarterly branch should take place within short order of each other, *possibly* with an delay *if* it requires ports-secteam approval, most changes are implicitly approved and don't require it), and the Bugzilla issue can be considered not resolved (or closed) until both the commit and the merge takes place.