From owner-svn-src-user@FreeBSD.ORG  Wed Sep 10 10:40:17 2014
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0048EB9B;
 Wed, 10 Sep 2014 10:40:16 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E01391BB5;
 Wed, 10 Sep 2014 10:40:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8AAeGow072994;
 Wed, 10 Sep 2014 10:40:16 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8AAeG76072992;
 Wed, 10 Sep 2014 10:40:16 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201409101040.s8AAeG76072992@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org
 using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Wed, 10 Sep 2014 10:40:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r271376 - in user/ngie/add-pjdfstest/contrib/pjdfstest: .
 tests
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Sep 2014 10:40:17 -0000

Author: ngie
Date: Wed Sep 10 10:40:16 2014
New Revision: 271376
URL: http://svnweb.freebsd.org/changeset/base/271376

Log:
  Remove tests/conf

Added:
  user/ngie/add-pjdfstest/contrib/pjdfstest/FREEBSD-Xlist
Deleted:
  user/ngie/add-pjdfstest/contrib/pjdfstest/tests/conf
Modified:
  user/ngie/add-pjdfstest/contrib/pjdfstest/FREEBSD-upgrade

Added: user/ngie/add-pjdfstest/contrib/pjdfstest/FREEBSD-Xlist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/ngie/add-pjdfstest/contrib/pjdfstest/FREEBSD-Xlist	Wed Sep 10 10:40:16 2014	(r271376)
@@ -0,0 +1 @@
+tests/conf

Modified: user/ngie/add-pjdfstest/contrib/pjdfstest/FREEBSD-upgrade
==============================================================================
--- user/ngie/add-pjdfstest/contrib/pjdfstest/FREEBSD-upgrade	Wed Sep 10 10:09:34 2014	(r271375)
+++ user/ngie/add-pjdfstest/contrib/pjdfstest/FREEBSD-upgrade	Wed Sep 10 10:40:16 2014	(r271376)
@@ -18,6 +18,7 @@ To merge the vendor branch into head do 
 	cd .../base/head/contrib/pjdfstest
 	svn merge --accept=postpone \
 	    svn+ssh://svn.freebsd.org/base/vendor/pjdfstest/dist .
+	svn remove --force $(cat FREEBSD-Xlist)
 
 and resolve any conflicts that may arise at this point.