Index: user/ngie/add-pjdfstest/contrib/pjdfstest/FREEBSD-Xlist
===================================================================
--- user/ngie/add-pjdfstest/contrib/pjdfstest/FREEBSD-Xlist	(nonexistent)
+++ user/ngie/add-pjdfstest/contrib/pjdfstest/FREEBSD-Xlist	(revision 271376)
@@ -0,0 +1 @@
+tests/conf
Index: user/ngie/add-pjdfstest/contrib/pjdfstest/FREEBSD-upgrade
===================================================================
--- user/ngie/add-pjdfstest/contrib/pjdfstest/FREEBSD-upgrade	(revision 271375)
+++ user/ngie/add-pjdfstest/contrib/pjdfstest/FREEBSD-upgrade	(revision 271376)
@@ -1,25 +1,26 @@
 $FreeBSD$
 
 This document contains a collection of notes specific to the import
 of pjdfstest into head.  These notes are built on the instructions in
 the FreeBSD Subversion Primer that detail how to deal with vendor
 branches and you are supposed to follow those:
 
 	http://www.freebsd.org/doc/en/articles/committers-guide/subversion-primer.html
 
 The pjdfstest source code is hosted on GitHub:
 
 	https://github.com/pjd/pjdfstest
 
 and is imported into the pjdfstest vendor branch (see base/vendor/pjdfstest/).
 
 To merge the vendor branch into head do something like this:
 
 	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.
 
 Lastly, with the list of old and new files in this import, make sure
 to udpate the reachover Makefiles accordingly.
Index: user/ngie/add-pjdfstest/contrib/pjdfstest/tests/conf
===================================================================
--- user/ngie/add-pjdfstest/contrib/pjdfstest/tests/conf	(revision 271375)
+++ user/ngie/add-pjdfstest/contrib/pjdfstest/tests/conf	(nonexistent)
@@ -1,36 +0,0 @@
-# $FreeBSD: head/tools/regression/pjdfstest/tests/conf 211354 2010-08-15 21:29:03Z pjd $
-# pjdfstest configuration file
-
-# Supported operating systems: FreeBSD, Darwin, SunOS, Linux
-os=`uname`
-
-case "${os}" in
-FreeBSD|Darwin)
-	GREP=grep
-	#fs=`df -T . | tail -1 | awk '{print $2}'`
-	pattern="`df . | tail -1 | awk '{printf("%s on %s \n", $1, $6)}'`"
-	fs=`mount | ${GREP} -E "^${pattern}" | awk -F '[(,]' '{print toupper($2)}'`
-	;;
-Solaris|SunOS)
-	GREP=ggrep
-	pattern=`df -Pk . | tail -1 | awk '{printf("%s on %s \n", $1, $6)}'`
-	fs=`mount -v | ${GREP} -E "^${pattern}" | awk '{print $5}' | \
-	    tr -s '[:lower:]' '[:upper:]'`
-	;;
-Linux)
-	GREP=grep
-	fs=`df -PT . | tail -1 | awk '{print toupper($2)}'`
-	;;
-*)
-	echo "Unsupported operating system ${os}." >/dev/stderr
-	exit 1
-	;;
-esac
-
-# If we cannot figure out file system type, define it here.
-#fs="UFS"
-
-if [ -z "${fs}" ]; then
-	echo "Cannot figure out file system type, define it by hand." >/dev/stderr
-	exit 1
-fi