Return-Path: X-Original-To: apmail-apr-dev-archive@www.apache.org Delivered-To: apmail-apr-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 46F02951C for ; Sun, 1 Apr 2012 21:00:26 +0000 (UTC) Received: (qmail 18217 invoked by uid 500); 1 Apr 2012 21:00:25 -0000 Delivered-To: apmail-apr-dev-archive@apr.apache.org Received: (qmail 18150 invoked by uid 500); 1 Apr 2012 21:00:25 -0000 Mailing-List: contact dev-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Id: Delivered-To: mailing list dev@apr.apache.org Received: (qmail 18140 invoked by uid 99); 1 Apr 2012 21:00:25 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Apr 2012 21:00:25 +0000 X-ASF-Spam-Status: No, hits=-0.7 required=5.0 tests=RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of gstein@gmail.com designates 209.85.220.178 as permitted sender) Received: from [209.85.220.178] (HELO mail-vx0-f178.google.com) (209.85.220.178) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Apr 2012 21:00:19 +0000 Received: by vcbgb30 with SMTP id gb30so2024360vcb.37 for ; Sun, 01 Apr 2012 13:59:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=VSuysVrSYK7dUxpUOlHzeCRYK7nVE6VTMfIdD1Y7kVQ=; b=pwzQaKXx3s86frID0P3Gv9OVwCmxIDkQCuCuwd21XkerJu6ZFjj3WmzbEF8ouZqumX 2HQPUoV7LJDgK1UXogMhdHKYE0ocjqA8TmBoMBfO8pBIZagEZoRgbYrcP5cuffB2OQGn YhX+u6peLsC4ECeORP5AllrzOTTPq01VGaRInUejfX/P0NniPSd7+jPGy9gH3lD/9hCK B/o6M/v9mn1XvvRP9+PuxSsQexUaWF3zMH3a4CqQhHrlVhzb1q0qLqZUxx7AXxdR2dvE TAwyTYYFT9ToX1Gv8LdgAAHl6FzLPwtoNxI9KNj7LSz/BFEbpYU288t8ssh5gYK572ZC /DRQ== MIME-Version: 1.0 Received: by 10.220.151.71 with SMTP id b7mr2790895vcw.62.1333313998610; Sun, 01 Apr 2012 13:59:58 -0700 (PDT) Received: by 10.220.150.69 with HTTP; Sun, 1 Apr 2012 13:59:58 -0700 (PDT) In-Reply-To: <10ABFDD6-69B0-408E-90D0-A9761520AC7F@sharp.fm> References: <20120401120332.EDC48238890B@eris.apache.org> <9E96BE93-61B7-4924-AEE0-B9F7060774E3@sharp.fm> <10ABFDD6-69B0-408E-90D0-A9761520AC7F@sharp.fm> Date: Sun, 1 Apr 2012 16:59:58 -0400 Message-ID: Subject: Re: svn commit: r1308088 - in /apr/apr-util/branches/1.5.x: ./ crypto/apr_crypto.c From: Greg Stein To: Graham Leggett Cc: dev@apr.apache.org Content-Type: text/plain; charset=ISO-8859-1 On Sun, Apr 1, 2012 at 16:55, Graham Leggett wrote: > On 01 Apr 2012, at 10:52 PM, Greg Stein wrote: > >> -087, I meant. >> >> A proper merge should include all changes. Not just a portion of the >> revision. Where did CHANGES go? > > CHANGES was committed to apr-trunk by mistake, and I meant to take it out. Then you need to document such things in the log message. I've made the proper edit. -g