NetBSD Problem Report #45859

From paul@whooppee.com  Fri Jan 20 03:10:27 2012
Return-Path: <paul@whooppee.com>
Received: from mail.netbsd.org (mail.netbsd.org [204.152.190.11])
	by www.NetBSD.org (Postfix) with ESMTP id 0118863B91B
	for <gnats-bugs@gnats.NetBSD.org>; Fri, 20 Jan 2012 03:10:26 +0000 (UTC)
Message-Id: <20120120031025.67B29247679@screamer.whooppee.com>
Date: Thu, 19 Jan 2012 19:10:25 -0800 (PST)
From: paul@whooppee.com
Reply-To: paul@whooppee.com
To: gnats-bugs@gnats.NetBSD.org
Subject: atf-report - tests-results.xsl produces incorrect output
X-Send-Pr-Version: 3.95

>Number:         45859
>Category:       bin
>Synopsis:       atf-report - tests-results.xsl produces incorrect output
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    jmmv
>State:          closed
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri Jan 20 03:15:00 +0000 2012
>Closed-Date:    Tue Jan 24 13:55:33 +0000 2012
>Last-Modified:  Wed Jul 11 22:40:02 +0000 2012
>Originator:     Paul Goyette
>Release:        NetBSD 5.99.60
>Organization:
-------------------------------------------------------------------------
| Paul Goyette     | PGP Key fingerprint:     | E-mail addresses:       |
| Customer Service | FA29 0E3B 35AF E8AE 6651 | paul at whooppee.com    |
| Network Engineer | 0786 F758 55DE 53BA 7731 | pgoyette at juniper.net |
| Kernel Developer |                          | pgoyette at netbsd.org  |
-------------------------------------------------------------------------
>Environment:


System: NetBSD 5.99.60 (GENERIC) #0: Fri Jan 20 00:31:20 UTC 2012 root@screamer.whooppee.com:/test-bed/obj/sys/arch/amd64/compile/GENERIC
Architecture: x86_64
Machine: amd64
>Description:
	(Please reassign if bin is not the correct category for code that
	lives in src/external/ hierarchy.)

	The tests-results.xsl file as provided generates invalid .html code.  
	While the invalid tags are (apparently) ignored by browsers, they
	prevent right-margin text alignment for the "Duration" field as
	specified in the tests-results.css style sheet.
>How-To-Repeat:
	1. Use "atf-run | atf-report -o xml:xxx.xml" to generate the xml
	   output.  The file will contain text similar to the following for
	   the test-program and test-case duration values:

		...
		<passed />
		<tc-time>1.173351</tc-time></tc>
		<tp-time>5.399477</tp-time></tp>
		...

	2. Use "xsltproc tests-resultss.xsl xxx.xml" to generate the html
	   output.  This results in output similar to

		...
		<td class="numeric"><tc-time>1.173351</tc-time>s</td>
		...
		<td class="numeric"><tp-time>5.399477</tp-time>s</td>
		...

	3. The bogus <tc-time>...</tc-time> and <tp-time>...</tp-time>
	   tags prevent the style sheet from matching and applying the
	   following attributes, and the output field ends up being
	   left-justified:

		...
		table.tcs-summary td.numeric {
		    text-align: right;
		    width: 1pt;
		}
		...

>Fix:
	Sorry, my XML skills don't let me figure out the fix.  :9


>Release-Note:

>Audit-Trail:

Responsible-Changed-From-To: bin-bug-people->jmmv
Responsible-Changed-By: wiz@NetBSD.org
Responsible-Changed-When: Fri, 20 Jan 2012 07:29:25 +0000
Responsible-Changed-Why:
Over to atf maintainer.


From: "Julio Merino" <jmmv@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc: 
Subject: PR/45859 CVS commit: src/external/bsd/atf/dist/atf-report
Date: Mon, 23 Jan 2012 23:03:40 +0000

 Module Name:	src
 Committed By:	jmmv
 Date:		Mon Jan 23 23:03:39 UTC 2012

 Modified Files:
 	src/external/bsd/atf/dist/atf-report: tests-results.css
 	    tests-results.xsl

 Log Message:
 Pull up upstream revision db8568696ad5a100ab3f118ac1cde53ee61ccbc3:

 Fix some XSLT/CSS bugs that leaked some internal tags into the HTML file.
 This, together with some CSS inconsistency, supposedly prevented the
 timestamp column from being right-aligned... although I have not been able
 to reproduce it with neither Chrome nor Firefox.  That said, the changes
 in here should fix this.

 While doing this, also change the background color of the timestamp column
 for test programs to improve the divider bar between test programs.

 Based on patches and ideas from pgoyette@.  Should fix PR bin/45859.


 To generate a diff of this commit:
 cvs rdiff -u -r1.4 -r1.5 \
     src/external/bsd/atf/dist/atf-report/tests-results.css
 cvs rdiff -u -r1.6 -r1.7 \
     src/external/bsd/atf/dist/atf-report/tests-results.xsl

 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.

State-Changed-From-To: open->feedback
State-Changed-By: jmmv@NetBSD.org
State-Changed-When: Mon, 23 Jan 2012 23:06:38 +0000
State-Changed-Why:
Given that I could not reproduce the alignment issue, I'll let Paul confirm
that this is actually fixed.


State-Changed-From-To: feedback->closed
State-Changed-By: pgoyette@NetBSD.org
State-Changed-When: Tue, 24 Jan 2012 13:55:33 +0000
State-Changed-Why:
Confirmed fixed.


From: "Julio Merino" <jmmv@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc: 
Subject: PR/45859 CVS commit: pkgsrc/devel
Date: Tue, 10 Jul 2012 22:02:59 +0000

 Module Name:	pkgsrc
 Committed By:	jmmv
 Date:		Tue Jul 10 22:02:59 UTC 2012

 Modified Files:
 	pkgsrc/devel/atf: Makefile Makefile.common distinfo
 	pkgsrc/devel/atf-libs: PLIST buildlink3.mk

 Log Message:
 Update to ATF 0.16:

 Experimental version released on July 10th, 2012.

 * Added a --enable-tools flag to configure to request the build of the
   deprecated ATF tools, whose build is now disabled by default.  In order
   to continue running tests, you should migrate to Kyua instead of enabling
   the build of the deprecated tools.  The kyua-atf-compat package provides
   transitional compatibility versions of atf-run and atf-report built on
   top of Kyua.

 * Tweaked the ATF_TEST_CASE macro of atf-c++ so that the compiler can
   detect defined but unused test cases.

 * PR bin/45859: Fixed some XSLT bugs that resulted in the tc-time and
   tp-time XML tags leaking into the generated HTML file.  Also improved
   the CSS file slightly to correct alignment and color issues with the
   timestamps column.

 * Optimized atf-c++/macros.hpp so that GNU G++ consumes less memory during
   compilation with GNU G++.

 * Flipped the default to building shared libraries for atf-c and atf-c++,
   and started versioning them.  As a side-effect, this removes the
   --enable-unstable-shared flag from configure that appears to not work any
   more (under NetBSD).  Additionally, some distributions require the use of
   shared libraries for proper dependency tracking (e.g. Fedora), so it is
   better if we do the right versioning upstream.

 * Project hosting moved from an adhoc solution (custom web site and
   Monotone repository) to Google Code (standard wiki and Git).  ATF now
   lives in a subcomponent of the Kyua project.


 To generate a diff of this commit:
 cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/atf/Makefile
 cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/atf/Makefile.common
 cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/atf/distinfo
 cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/atf-libs/PLIST \
     pkgsrc/devel/atf-libs/buildlink3.mk

 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.

From: "Julio Merino" <jmmv@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc: 
Subject: PR/45859 CVS commit: src/external/bsd/atf/dist
Date: Wed, 11 Jul 2012 22:37:16 +0000

 Module Name:	src
 Committed By:	jmmv
 Date:		Wed Jul 11 22:37:16 UTC 2012

 Update of /cvsroot/src/external/bsd/atf/dist
 In directory ivanova.netbsd.org:/tmp/cvs-serv29292

 Log Message:
 Import atf 0.16:

 Experimental version released on July 10th, 2012.

 * Added a --enable-tools flag to configure to request the build of the
   deprecated ATF tools, whose build is now disabled by default.  In order
   to continue running tests, you should migrate to Kyua instead of enabling
   the build of the deprecated tools.  The kyua-atf-compat package provides
   transitional compatibility versions of atf-run and atf-report built on
   top of Kyua.

 * Tweaked the ATF_TEST_CASE macro of atf-c++ so that the compiler can
   detect defined but unused test cases.

 * PR bin/45859: Fixed some XSLT bugs that resulted in the tc-time and
   tp-time XML tags leaking into the generated HTML file.  Also improved
   the CSS file slightly to correct alignment and color issues with the
   timestamps column.

 * Optimized atf-c++/macros.hpp so that GNU G++ consumes less memory during
   compilation with GNU G++.

 * Flipped the default to building shared libraries for atf-c and atf-c++,
   and started versioning them.  As a side-effect, this removes the
   --enable-unstable-shared flag from configure that appears to not work any
   more (under NetBSD).  Additionally, some distributions require the use of
   shared libraries for proper dependency tracking (e.g. Fedora), so it is
   better if we do the right versioning upstream.

 * Project hosting moved from an adhoc solution (custom web site and
   Monotone repository) to Google Code (standard wiki and Git).  ATF now
   lives in a subcomponent of the Kyua project.

 Status:

 Vendor Tag:	TNF
 Release Tags:	atf-0-16

 U src/external/bsd/atf/dist/atf-c++.hpp
 U src/external/bsd/atf/dist/Atffile
 U src/external/bsd/atf/dist/README
 U src/external/bsd/atf/dist/Kyuafile
 U src/external/bsd/atf/dist/atf-c.h
 U src/external/bsd/atf/dist/AUTHORS
 U src/external/bsd/atf/dist/NEWS
 U src/external/bsd/atf/dist/COPYING
 U src/external/bsd/atf/dist/test-programs/meta_data_test.sh
 U src/external/bsd/atf/dist/test-programs/Atffile
 U src/external/bsd/atf/dist/test-programs/Kyuafile
 U src/external/bsd/atf/dist/test-programs/c_helpers.c
 U src/external/bsd/atf/dist/test-programs/srcdir_test.sh
 U src/external/bsd/atf/dist/test-programs/fork_test.sh
 U src/external/bsd/atf/dist/test-programs/config_test.sh
 U src/external/bsd/atf/dist/test-programs/common.sh
 U src/external/bsd/atf/dist/test-programs/cpp_helpers.cpp
 U src/external/bsd/atf/dist/test-programs/sh_helpers.sh
 U src/external/bsd/atf/dist/test-programs/result_test.sh
 U src/external/bsd/atf/dist/test-programs/expect_test.sh
 U src/external/bsd/atf/dist/atf-version/generate-revision.sh
 C src/external/bsd/atf/dist/atf-version/atf-version.cpp
 U src/external/bsd/atf/dist/atf-version/atf-version.1
 U src/external/bsd/atf/dist/atf-run/atf-run.1
 U src/external/bsd/atf/dist/atf-run/timer.hpp
 U src/external/bsd/atf/dist/atf-run/io.hpp
 U src/external/bsd/atf/dist/atf-run/atffile.hpp
 U src/external/bsd/atf/dist/atf-run/Atffile
 U src/external/bsd/atf/dist/atf-run/config_test.cpp
 U src/external/bsd/atf/dist/atf-run/Kyuafile
 U src/external/bsd/atf/dist/atf-run/signals.hpp
 U src/external/bsd/atf/dist/atf-run/user.hpp
 U src/external/bsd/atf/dist/atf-run/requirements_test.cpp
 U src/external/bsd/atf/dist/atf-run/test-program.hpp
 U src/external/bsd/atf/dist/atf-run/atffile_test.cpp
 U src/external/bsd/atf/dist/atf-run/config.cpp
 U src/external/bsd/atf/dist/atf-run/zero_tcs_helper.c
 U src/external/bsd/atf/dist/atf-run/signals_test.cpp
 U src/external/bsd/atf/dist/atf-run/pass_helper.cpp
 U src/external/bsd/atf/dist/atf-run/io.cpp
 U src/external/bsd/atf/dist/atf-run/io_test.cpp
 C src/external/bsd/atf/dist/atf-run/fs.cpp
 U src/external/bsd/atf/dist/atf-run/test-program.cpp
 U src/external/bsd/atf/dist/atf-run/bad_metadata_helper.c
 U src/external/bsd/atf/dist/atf-run/user_test.cpp
 U src/external/bsd/atf/dist/atf-run/signals.cpp
 U src/external/bsd/atf/dist/atf-run/integration_test.sh
 U src/external/bsd/atf/dist/atf-run/atffile.cpp
 U src/external/bsd/atf/dist/atf-run/atf-run.cpp
 U src/external/bsd/atf/dist/atf-run/fs.hpp
 C src/external/bsd/atf/dist/atf-run/test_program_test.cpp
 U src/external/bsd/atf/dist/atf-run/fs_test.cpp
 U src/external/bsd/atf/dist/atf-run/expect_helpers.c
 U src/external/bsd/atf/dist/atf-run/user.cpp
 U src/external/bsd/atf/dist/atf-run/timer.cpp
 U src/external/bsd/atf/dist/atf-run/requirements.hpp
 U src/external/bsd/atf/dist/atf-run/requirements.cpp
 U src/external/bsd/atf/dist/atf-run/misc_helpers.cpp
 U src/external/bsd/atf/dist/atf-run/several_tcs_helper.c
 U src/external/bsd/atf/dist/atf-run/config.hpp
 U src/external/bsd/atf/dist/atf-run/share/atf-run.hooks
 U src/external/bsd/atf/dist/atf-run/sample/atf-run.hooks
 U src/external/bsd/atf/dist/atf-run/sample/common.conf
 U src/external/bsd/atf/dist/atf-c++/pkg_config_test.sh
 U src/external/bsd/atf/dist/atf-c++/Atffile
 U src/external/bsd/atf/dist/atf-c++/Kyuafile
 U src/external/bsd/atf/dist/atf-c++/macros_test.cpp
 U src/external/bsd/atf/dist/atf-c++/config_test.cpp
 U src/external/bsd/atf/dist/atf-c++/config.cpp
 U src/external/bsd/atf/dist/atf-c++/utils_test.cpp
 U src/external/bsd/atf/dist/atf-c++/build.cpp
 U src/external/bsd/atf/dist/atf-c++/macros_hpp_test.cpp
 U src/external/bsd/atf/dist/atf-c++/tests_test.cpp
 U src/external/bsd/atf/dist/atf-c++/atf-c++.pc.in
 U src/external/bsd/atf/dist/atf-c++/check.cpp
 U src/external/bsd/atf/dist/atf-c++/check_test.cpp
 U src/external/bsd/atf/dist/atf-c++/atf_c++_test.cpp
 N src/external/bsd/atf/dist/atf-c++/unused_test.cpp
 U src/external/bsd/atf/dist/atf-c++/utils.hpp
 U src/external/bsd/atf/dist/atf-c++/atf-c++-api.3
 U src/external/bsd/atf/dist/atf-c++/tests.hpp
 U src/external/bsd/atf/dist/atf-c++/macros.hpp
 U src/external/bsd/atf/dist/atf-c++/build.hpp
 U src/external/bsd/atf/dist/atf-c++/check.hpp
 U src/external/bsd/atf/dist/atf-c++/build_test.cpp
 U src/external/bsd/atf/dist/atf-c++/tests.cpp
 U src/external/bsd/atf/dist/atf-c++/config.hpp
 U src/external/bsd/atf/dist/atf-c++/detail/text.cpp
 U src/external/bsd/atf/dist/atf-c++/detail/exceptions_test.cpp
 U src/external/bsd/atf/dist/atf-c++/detail/application.hpp
 U src/external/bsd/atf/dist/atf-c++/detail/process.hpp
 U src/external/bsd/atf/dist/atf-c++/detail/text.hpp
 U src/external/bsd/atf/dist/atf-c++/detail/Atffile
 U src/external/bsd/atf/dist/atf-c++/detail/Kyuafile
 U src/external/bsd/atf/dist/atf-c++/detail/ui.cpp
 U src/external/bsd/atf/dist/atf-c++/detail/env.hpp
 U src/external/bsd/atf/dist/atf-c++/detail/parser.cpp
 U src/external/bsd/atf/dist/atf-c++/detail/fs.cpp
 U src/external/bsd/atf/dist/atf-c++/detail/exceptions.cpp
 U src/external/bsd/atf/dist/atf-c++/detail/env_test.cpp
 U src/external/bsd/atf/dist/atf-c++/detail/application_test.cpp
 U src/external/bsd/atf/dist/atf-c++/detail/process_test.cpp
 U src/external/bsd/atf/dist/atf-c++/detail/text_test.cpp
 U src/external/bsd/atf/dist/atf-c++/detail/expand.cpp
 U src/external/bsd/atf/dist/atf-c++/detail/parser.hpp
 U src/external/bsd/atf/dist/atf-c++/detail/sanity_test.cpp
 U src/external/bsd/atf/dist/atf-c++/detail/parser_test.cpp
 U src/external/bsd/atf/dist/atf-c++/detail/fs_test.cpp
 U src/external/bsd/atf/dist/atf-c++/detail/sanity.hpp
 U src/external/bsd/atf/dist/atf-c++/detail/exceptions.hpp
 U src/external/bsd/atf/dist/atf-c++/detail/ui.hpp
 U src/external/bsd/atf/dist/atf-c++/detail/test_helpers.cpp
 U src/external/bsd/atf/dist/atf-c++/detail/expand_test.cpp
 U src/external/bsd/atf/dist/atf-c++/detail/process.cpp
 U src/external/bsd/atf/dist/atf-c++/detail/expand.hpp
 U src/external/bsd/atf/dist/atf-c++/detail/fs.hpp
 U src/external/bsd/atf/dist/atf-c++/detail/ui_test.cpp
 U src/external/bsd/atf/dist/atf-c++/detail/env.cpp
 U src/external/bsd/atf/dist/atf-c++/detail/test_helpers.hpp
 U src/external/bsd/atf/dist/atf-c++/detail/application.cpp
 U src/external/bsd/atf/dist/doc/atf-test-program.1
 U src/external/bsd/atf/dist/doc/atf-formats.5
 U src/external/bsd/atf/dist/doc/atf-test-case.4
 U src/external/bsd/atf/dist/doc/atf.7.in
 U src/external/bsd/atf/dist/atf-report/tests-results.dtd
 U src/external/bsd/atf/dist/atf-report/Atffile
 U src/external/bsd/atf/dist/atf-report/fail_helper.cpp
 U src/external/bsd/atf/dist/atf-report/Kyuafile
 U src/external/bsd/atf/dist/atf-report/pass_helper.cpp
 C src/external/bsd/atf/dist/atf-report/tests-results.xsl
 U src/external/bsd/atf/dist/atf-report/reader.hpp
 U src/external/bsd/atf/dist/atf-report/atf-report.cpp
 U src/external/bsd/atf/dist/atf-report/reader_test.cpp
 U src/external/bsd/atf/dist/atf-report/integration_test.sh
 U src/external/bsd/atf/dist/atf-report/atf-report.1
 C src/external/bsd/atf/dist/atf-report/tests-results.css
 U src/external/bsd/atf/dist/atf-report/misc_helpers.cpp
 U src/external/bsd/atf/dist/atf-report/reader.cpp
 U src/external/bsd/atf/dist/atf-c/pkg_config_test.sh
 U src/external/bsd/atf/dist/atf-c/Atffile
 U src/external/bsd/atf/dist/atf-c/build_test.c
 U src/external/bsd/atf/dist/atf-c/atf-c-api.3
 U src/external/bsd/atf/dist/atf-c/config.c
 U src/external/bsd/atf/dist/atf-c/Kyuafile
 U src/external/bsd/atf/dist/atf-c/config.h
 U src/external/bsd/atf/dist/atf-c/atf_c_test.c
 U src/external/bsd/atf/dist/atf-c/macros.h
 U src/external/bsd/atf/dist/atf-c/tc_test.c
 U src/external/bsd/atf/dist/atf-c/macros_test.c
 U src/external/bsd/atf/dist/atf-c/build.c
 U src/external/bsd/atf/dist/atf-c/defs.h.in
 U src/external/bsd/atf/dist/atf-c/error.h
 U src/external/bsd/atf/dist/atf-c/config_test.c
 U src/external/bsd/atf/dist/atf-c/error_test.c
 U src/external/bsd/atf/dist/atf-c/check.c
 U src/external/bsd/atf/dist/atf-c/tp_test.c
 U src/external/bsd/atf/dist/atf-c/tc.h
 U src/external/bsd/atf/dist/atf-c/utils.h
 U src/external/bsd/atf/dist/atf-c/tp.h
 U src/external/bsd/atf/dist/atf-c/macros_h_test.c
 U src/external/bsd/atf/dist/atf-c/tp.c
 U src/external/bsd/atf/dist/atf-c/check.h
 N src/external/bsd/atf/dist/atf-c/unused_test.c
 U src/external/bsd/atf/dist/atf-c/utils_test.c
 U src/external/bsd/atf/dist/atf-c/tc.c
 U src/external/bsd/atf/dist/atf-c/error_fwd.h
 U src/external/bsd/atf/dist/atf-c/h_build.h
 U src/external/bsd/atf/dist/atf-c/build.h
 U src/external/bsd/atf/dist/atf-c/utils.c
 U src/external/bsd/atf/dist/atf-c/atf-c.pc.in
 U src/external/bsd/atf/dist/atf-c/error.c
 U src/external/bsd/atf/dist/atf-c/check_test.c
 U src/external/bsd/atf/dist/atf-c/detail/env.c
 U src/external/bsd/atf/dist/atf-c/detail/map_test.c
 U src/external/bsd/atf/dist/atf-c/detail/dynstr.h
 U src/external/bsd/atf/dist/atf-c/detail/Atffile
 U src/external/bsd/atf/dist/atf-c/detail/text_test.c
 U src/external/bsd/atf/dist/atf-c/detail/Kyuafile
 U src/external/bsd/atf/dist/atf-c/detail/text.h
 U src/external/bsd/atf/dist/atf-c/detail/test_helpers_test.c
 C src/external/bsd/atf/dist/atf-c/detail/test_helpers.c
 U src/external/bsd/atf/dist/atf-c/detail/list_test.c
 U src/external/bsd/atf/dist/atf-c/detail/process_test.c
 U src/external/bsd/atf/dist/atf-c/detail/sanity_test.c
 U src/external/bsd/atf/dist/atf-c/detail/list.h
 U src/external/bsd/atf/dist/atf-c/detail/env_test.c
 U src/external/bsd/atf/dist/atf-c/detail/map.c
 U src/external/bsd/atf/dist/atf-c/detail/list.c
 U src/external/bsd/atf/dist/atf-c/detail/process.h
 U src/external/bsd/atf/dist/atf-c/detail/text.c
 U src/external/bsd/atf/dist/atf-c/detail/fs.c
 U src/external/bsd/atf/dist/atf-c/detail/process_helpers.c
 U src/external/bsd/atf/dist/atf-c/detail/test_helpers.h
 U src/external/bsd/atf/dist/atf-c/detail/dynstr_test.c
 U src/external/bsd/atf/dist/atf-c/detail/map.h
 U src/external/bsd/atf/dist/atf-c/detail/user.c
 U src/external/bsd/atf/dist/atf-c/detail/sanity.h
 U src/external/bsd/atf/dist/atf-c/detail/tp_main.c
 U src/external/bsd/atf/dist/atf-c/detail/fs.h
 U src/external/bsd/atf/dist/atf-c/detail/user.h
 U src/external/bsd/atf/dist/atf-c/detail/user_test.c
 U src/external/bsd/atf/dist/atf-c/detail/sanity.c
 U src/external/bsd/atf/dist/atf-c/detail/env.h
 U src/external/bsd/atf/dist/atf-c/detail/process.c
 U src/external/bsd/atf/dist/atf-c/detail/fs_test.c
 U src/external/bsd/atf/dist/atf-c/detail/dynstr.c
 U src/external/bsd/atf/dist/atf-sh/tp_test.sh
 U src/external/bsd/atf/dist/atf-sh/atf_check_test.sh
 U src/external/bsd/atf/dist/atf-sh/Atffile
 U src/external/bsd/atf/dist/atf-sh/Kyuafile
 U src/external/bsd/atf/dist/atf-sh/libatf-sh.subr
 U src/external/bsd/atf/dist/atf-sh/atf-check.1
 U src/external/bsd/atf/dist/atf-sh/config_test.sh
 U src/external/bsd/atf/dist/atf-sh/atf-sh.cpp
 U src/external/bsd/atf/dist/atf-sh/atf-check_test.sh
 U src/external/bsd/atf/dist/atf-sh/integration_test.sh
 U src/external/bsd/atf/dist/atf-sh/atf-sh-api.3
 U src/external/bsd/atf/dist/atf-sh/atf-sh.1
 U src/external/bsd/atf/dist/atf-sh/misc_helpers.sh
 U src/external/bsd/atf/dist/atf-sh/tc_test.sh
 U src/external/bsd/atf/dist/atf-sh/atf-sh.pc.in
 C src/external/bsd/atf/dist/atf-sh/atf-check.cpp
 U src/external/bsd/atf/dist/atf-sh/normalize_test.sh
 U src/external/bsd/atf/dist/atf-config/integration_test.sh
 U src/external/bsd/atf/dist/atf-config/Atffile
 U src/external/bsd/atf/dist/atf-config/Kyuafile
 U src/external/bsd/atf/dist/atf-config/atf-config.cpp
 U src/external/bsd/atf/dist/atf-config/atf-config.1

 7 conflicts created by this import.
 Use the following command to help the merge:

 	cvs checkout -jTNF:yesterday -jTNF src/external/bsd/atf/dist

>Unformatted:

Home	PR Database Search