Return-Path: X-Original-To: apmail-subversion-dev-archive@minotaur.apache.org Delivered-To: apmail-subversion-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D059010413 for ; Sat, 28 Feb 2015 13:39:13 +0000 (UTC) Received: (qmail 84723 invoked by uid 500); 28 Feb 2015 13:39:13 -0000 Delivered-To: apmail-subversion-dev-archive@subversion.apache.org Received: (qmail 84656 invoked by uid 500); 28 Feb 2015 13:39:13 -0000 Mailing-List: contact dev-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list dev@subversion.apache.org Received: (qmail 84645 invoked by uid 99); 28 Feb 2015 13:39:13 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 28 Feb 2015 13:39:13 +0000 X-ASF-Spam-Status: No, hits=0.7 required=5.0 tests=RCVD_IN_DNSWL_NONE,SPF_NEUTRAL X-Spam-Check-By: apache.org Received-SPF: error (athena.apache.org: encountered temporary error during SPF processing of domain of philip@codematters.co.uk) Received: from [80.0.253.68] (HELO know-smtprelay-omc-4.server.virginmedia.net) (80.0.253.68) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 28 Feb 2015 13:39:08 +0000 Received: from localhost ([86.15.228.14]) by know-smtprelay-4-imp with bizsmtp id xpeC1p01x0KGcRy01peCGy; Sat, 28 Feb 2015 13:38:12 +0000 X-Originating-IP: [86.15.228.14] X-Spam: 0 X-Authority: v=2.1 cv=S8BXwecP c=1 sm=1 tr=0 a=9gMFXHjZJ3oyElzdMYF63g==:117 a=9gMFXHjZJ3oyElzdMYF63g==:17 a=acKW_TVRZv8A:10 a=NTDmIo5yAAAA:8 a=UK53XgEPAAAA:8 a=NoyhDkTmuGNDw0gNF-oA:9 From: Philip Martin To: Branko =?utf-8?Q?=C4=8Cibej?= Cc: Subversion Development Subject: Re: 1.8.x backport conflicts bot is red References: <54F19E80.60302@wandisco.com> <87385qrwjj.fsf@wandisco.com> Date: Sat, 28 Feb 2015 13:38:12 +0000 In-Reply-To: <87385qrwjj.fsf@wandisco.com> (Philip Martin's message of "Sat, 28 Feb 2015 13:32:48 +0000") Message-ID: <87y4niqhq3.fsf@codematters.co.uk> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Virus-Checked: Checked by ClamAV on apache.org Philip Martin writes: > I could change the proposal > but I don't know if the backport script would then interpret Daniel's > vote for the other revisions as approving the whole backport: I don't think the backport script would do that but changing the proposal looks like the wrong thing: the 'missing' revisions are proposed for merge to 1.8.x just not from trunk. I suppose we could change the backport script to also look for 'missing' revisions in the commits made to the proposed branch. -- Philip