svn commit: r271376 - in user/ngie/add-pjdfstest/contrib/pjdfstest: . tests

[Garrett Cooper]

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.