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 6BA30200B7D for ; Sat, 10 Sep 2016 14:04:32 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 6A519160ABE; Sat, 10 Sep 2016 12:04:32 +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 B202C160AB2 for ; Sat, 10 Sep 2016 14:04:31 +0200 (CEST) Received: (qmail 29451 invoked by uid 500); 10 Sep 2016 12:04:30 -0000 Mailing-List: contact dev-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list dev@httpd.apache.org Received: (qmail 29441 invoked by uid 99); 10 Sep 2016 12:04:30 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 Sep 2016 12:04:30 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 31E2218066C for ; Sat, 10 Sep 2016 12:04:30 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -0.802 X-Spam-Level: X-Spam-Status: No, score=-0.802 tagged_above=-999 required=6.31 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001] autolearn=disabled Authentication-Results: spamd3-us-west.apache.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id YwvKJsLehq5D for ; Sat, 10 Sep 2016 12:04:28 +0000 (UTC) Received: from mail-qk0-f171.google.com (mail-qk0-f171.google.com [209.85.220.171]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTPS id 4D2595FAD5 for ; Sat, 10 Sep 2016 12:04:27 +0000 (UTC) Received: by mail-qk0-f171.google.com with SMTP id w204so103271973qka.0 for ; Sat, 10 Sep 2016 05:04:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to; bh=ZLXRd1DJpRa/NVmnho06lwqctwMF2hWXQia8Jwrf6R8=; b=aA/F0ccsX7mGiYGwYD9S+h1p7HsQ4P0dZtL5tkB4v9C/mn9xa9ZFRj3VhT81Djues5 r+ePZEbOV6MbW1zVSnof0Ag/Z/0mI2hFi1Km7Wpu/1g9qKtADogIjz+ODZa8GLxYcdrA Tau/7YVDMS2AO6m+4AbKaRDGOwDs+XCcxl1yth+U8FdNOIuadj72T6viku9ZwdVztTA3 iyl1IjTEx8xzGOjpiCj7I4uWhwHSAHyqX0LK1pM2P3yl+C2ujjI6uFJn2t12brKprsMj nl+gI1xdm9IC6jZ51wQTqk0zc4Gur7x3r4mim+wGkqXEg2+tQc21fh9RtO+u1HS+oTvf NM8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to; bh=ZLXRd1DJpRa/NVmnho06lwqctwMF2hWXQia8Jwrf6R8=; b=IX7zumMdgbuSJ2mltIHm2889ZOUYgHK1fcvmuluv8LiA7T8OVMogpk5Ulpuczn18pe ykoJEJrrvAWsj5+quwozNy0loePl47H9UUC3vxvzSUzbhqUbVX1k7MHmA6J7wU8+oo4v yDubU2Zz0YATd5sioPzSDX23pLq4ZL0+ubDt8+97Vnnal17nCChKETh/Ke+ktN/g+0r0 +unRh2DCH4Ir/Fo1pQL2smsDygn4lyKRCh6z0SRAmB9sIlGzlgYbt9a+AIhACYZzKuwM vwsdSxKFF+nOtLuykObQDnzhFvNSzUb02Ectric6sJgyKDgK/w2PXH4fNumCoij5aMKR YaxA== X-Gm-Message-State: AE9vXwMcbkCzbnZAINkrBp5wa2a41gwLYLCEpnhX3H9hfpH9T1M5Db87B8RPvbNCoA5gdOxibRSDey7t1856tA== X-Received: by 10.55.88.70 with SMTP id m67mr9394078qkb.47.1473509066357; Sat, 10 Sep 2016 05:04:26 -0700 (PDT) MIME-Version: 1.0 Received: by 10.55.17.23 with HTTP; Sat, 10 Sep 2016 05:04:25 -0700 (PDT) In-Reply-To: References: <20160910102256.EE1AD3A0929@svn01-us-west.apache.org> From: Yann Ylavic Date: Sat, 10 Sep 2016 14:04:25 +0200 Message-ID: Subject: Re: svn commit: r1760148 - in /httpd/httpd/branches/2.4.x: ./ STATUS To: httpd-dev Content-Type: text/plain; charset=UTF-8 archived-at: Sat, 10 Sep 2016 12:04:32 -0000 On Sat, Sep 10, 2016 at 12:45 PM, Luca Toscano wrote: > > The diff are my two commits proposed to backport, that have been probably > tracked in my local repo, but I am ignorant about the topic so I am going to > stop and wait for a more expert opinion. It was of course not intended, > really sorry if I have caused any issue. No problem, that happens ;) > > IIUC I altered the mergeinfo tracking story with two commits that are not in > 2.4.x yet, what would be the best way forward? I just reverted r1760148 (but STATUS), with: $ svn merge -c -1760148 https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x/ $ svn revert STATUS $ svn ci ... Regards, Yann.