Revision: arch--devo--1.0--patch-2
Archive: lord@regexps.com--2002
Creator: Tom Lord <lord@regexps.com>
Date: Wed Jan  9 02:30:31 PST 2002
Standard-date: 2002-01-09
Summary: merge with `lord' branch
  (mostly for testing purposes)
Keywords: 
New-files: {arch}/arch/arch--devo/arch--devo--1.0/lord@regexps.com--2002/patch-log/patch-2
  {arch}/arch/arch--lord/arch--lord--1.0/lord@regexps.com--2002/patch-log/patch-12
  {arch}/arch/arch--lord/arch--lord--1.0/lord@regexps.com--2002/patch-log/patch-13
  {arch}/arch/arch--lord/arch--lord--1.0/lord@regexps.com--2002/patch-log/patch-14
  {arch}/arch/arch--lord/arch--lord--1.0/lord@regexps.com--2002/patch-log/patch-15
  patch-logs/log-for-merge.sh
Removed-files: local-cache/wd-new-patches.sh inventory/inventory-pkgtest.sh
Modified-files: =TODO ChangeLog
  ChangeLog.d/lord@regexps.com--2002/ChangeLog.lord--1.0
  archive-transactions/commit.sh
  archive-transactions/import.sh
  branching-and-merging/finish-branch.sh
  inventory/check-manifest.sh inventory/manifest.sh
  inventory/set-manifest.sh inventory/tagging-method.sh
  inventory/tree-lint.sh local-cache/add-pristine.sh
  local-cache/delete-pristine.sh local-cache/lock-pristine.sh
  patch-logs/add-log.sh patch-logs/cat-log.sh
  patch-logs/changelog.sh patch-logs/make-log.sh
  patch-logs/merge-points.sh patch-logs/new-on-branch.sh
  patch-logs/valid-log-file.sh patch-sets/patch-report.sh
  project-tree/init-tree.sh project-tree/set-tree-version.sh
New-patches: lord@regexps.com--2002/arch--devo--1.0--patch-2
  lord@regexps.com--2002/arch--lord--1.0--patch-12
  lord@regexps.com--2002/arch--lord--1.0--patch-13
  lord@regexps.com--2002/arch--lord--1.0--patch-14
  lord@regexps.com--2002/arch--lord--1.0--patch-15


This merges features from the `lord' branch.  Merging at this
particular time and with a multi-line subject heading is primarily to
help with debugging `star-merge' and writing `changelog-web'.

For details, see

	ChangeLog.d/lord@regexps.com--2002/ChangeLog.lord--1.0

Patches applied:

  * lord@regexps.com--2002/arch--lord--1.0--patch-15
     automatic changelog enhancements

  * lord@regexps.com--2002/arch--lord--1.0--patch-14
     `merge-points' fixes and `new-on-branch' speed-up

  * lord@regexps.com--2002/arch--lord--1.0--patch-13
     Use --dir consistently.

  * lord@regexps.com--2002/arch--lord--1.0--patch-12
     output format touch-ups

