From owner-svn-ports-head@FreeBSD.ORG Wed Oct 30 23:23:10 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 631004EE; Wed, 30 Oct 2013 23:23:10 +0000 (UTC) (envelope-from bsdkaffee@gmail.com) Received: from mail-qa0-x233.google.com (mail-qa0-x233.google.com [IPv6:2607:f8b0:400d:c00::233]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E2F2B2C4E; Wed, 30 Oct 2013 23:23:09 +0000 (UTC) Received: by mail-qa0-f51.google.com with SMTP id ii20so1267207qab.17 for ; Wed, 30 Oct 2013 16:23:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:user-agent:in-reply-to :references:mime-version:content-transfer-encoding:content-type; bh=fQzpePXNjKYGEjbRF+8t/58Z8z+6L+Uohc3nKa8jerk=; b=M1NYUKjv2lyYMi5AcYvWjL0ymIxqJMLWXRqRQXIZYO7Okuzrk94KnFQ7yY5I8nahML YKFqsos+AnHi24AoSGiF8yKOsphK88BprtTzivTv9JX0oPy2ClxzcnlqgN0qzPRHEZmF 1mcpq5k4UFqNYp2ggqUAcOE6O4cEyZqCz8tn4f0lzz9en/eFzjfFG9Qzq/khVxiYqsbz CrXh5ehW82pqnfkvQdX8SNCZSRKDZMcWqbiuc3r85e48c0B1htf3rEhkkDnLEpwz9FQ+ nndABeNWg2VKfQQ0HqPzws1ULpGKYEciS/kjX3vWtLmdVXZz10VuDTXBt1fjGRwKnR2T e/bg== X-Received: by 10.224.161.146 with SMTP id r18mr1152259qax.57.1383175388904; Wed, 30 Oct 2013 16:23:08 -0700 (PDT) Received: from mocha.verizon.net (c-71-61-40-68.hsd1.oh.comcast.net. [71.61.40.68]) by mx.google.com with ESMTPSA id ge5sm1053793qeb.5.2013.10.30.16.23.08 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 30 Oct 2013 16:23:08 -0700 (PDT) Sender: "Jason E. Hale" From: "Jason E. Hale" To: marino@freebsd.org Subject: Re: svn commit: r332099 - head/devel/cssc/files Date: Wed, 30 Oct 2013 19:23:07 -0400 Message-ID: <2602741.QmfnMIAQrR@mocha.verizon.net> User-Agent: KMail/4.10.5 (FreeBSD/9.2-RC4; KDE/4.10.5; i386; ; ) In-Reply-To: <52710244.3040708@marino.st> References: <201310301246.r9UCkiWu069471@svn.freebsd.org> <52710244.3040708@marino.st> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Oct 2013 23:23:10 -0000 On Wednesday, October 30, 2013 13:57:40 John Marino wrote: > On 10/30/2013 13:46, Jason E. Hale wrote: > > head/devel/cssc/files/patch-unit-tests__googletest__include__gtest__inte > > rnal__gtest-port.h (contents, props changed)> > > Added: > > head/devel/cssc/files/patch-unit-tests__googletest__include__gtest__inter > > nal__gtest-port.h > > ========================================================================= > > ===== --- /dev/null 00:00:00 1970 (empty, because file is newly added) > > Just today I patched this exact file (the patch file has a different name). > > So there may well be two patches on the same file. Moreover, what I > fixed is not present in this new patch. > Sorry, I guess my working copy was a little out of sync. The patch submitted by the maintainer does ultimately include . I ran build tests before committing it, so I can confirm that it works. If you don't mind, I'll just delete your patch so we don't have two patches for the same file. -- Jason E. Hale - jhale@ FreeBSD Ports Committer KDE/FreeBSD Team