Module Name: src Committed By: apb Date: Sat Mar 21 15:51:21 UTC 2015
Modified Files: src/external/public-domain/tz: tzdata2netbsd Log Message: Update tzdata2netbsd for tzdata2015b. * Edit version numbers. * Make the script deal better with being re-run multiple times. It now keeps a status file for each non-trivial step, and doesn't repeat the step if the sttaus file exists. * Instead of spawning a subshell to resolve merge conflicts, print a message and exit, with a suggestion to rte-run the script after conflicts are resolved. * Check whether there are any conflicts before trying to do anything about conflicts. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/public-domain/tz/tzdata2netbsd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.