Date: Fri, 15 Nov 2013 20:58:29 +0000 (UTC) From: Julio Merino <jmmv@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r258190 - vendor/atf Message-ID: <201311152058.rAFKwTEh077812@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jmmv Date: Fri Nov 15 20:58:29 2013 New Revision: 258190 URL: http://svnweb.freebsd.org/changeset/base/258190 Log: Update instructions to match reality. * Point readers to the Subversion Primer in the Committer's Guide instead of attempting to provide details here. The guide is much more complete. * Adjust some comments to better represent reality. * Prepare to import the whole contents of a release, per the Subversion Primer. Files should only be dropped when doing the merge into head/contrib/atf/ Approved by: rpaulo (mentor) Deleted: vendor/atf/FREEBSD-Xlist Modified: vendor/atf/README.txt Modified: vendor/atf/README.txt ============================================================================== --- vendor/atf/README.txt Fri Nov 15 20:41:02 2013 (r258189) +++ vendor/atf/README.txt Fri Nov 15 20:58:29 2013 (r258190) @@ -1,3 +1,5 @@ +$FreeBSD$ + Import tree for ATF: the Automated Testing Framework. Governance: http://code.google.com/p/kyua/wiki/ATF @@ -5,10 +7,11 @@ License: BSD (3-Clause) Upgrade instructions: 1. Download a newer version from the URL given above -2. Extract the tarball as per the guidelines -3. Run the following command to remove extraneous files: - sh -c 'for F in `cat FREEBSD-Xlist`; do rm -rf ./$F ; done' -4. Make sure to delete files that ere not present in the new version! -5. Commit vendor/atf (this should update dist and create a new 'tag') -6. Merge vendor/atf/dist to head/contrib/atf, and re-run configure -7. Commit head/contrib/atf +2. Prepare the import into dist/ as described in: + http://www.freebsd.org/doc/en/articles/committers-guide/subversion-primer.html +3. Make sure to delete files that ere not present in the new version! +4. Commit vendor/atf/dist (this should update dist and create a new 'tag') +5. Create a new tag for the import in vendor/atf/atf-<version> +6. Merge vendor/atf/dist to head/contrib/atf and re-run configure +7. Update reachover Makefiles to cope with deleted/new files, if any +8. Commit head/contrib/atf and the reachover Makefiles
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311152058.rAFKwTEh077812>