Revision: arch--devo--1.0--patch-13
Archive: lord@regexps.com--2002
Creator: Tom Lord <lord@regexps.com>
Date: Fri Jan 18 01:49:17 PST 2002
Standard-date: 2002-01-18
Summary: merge from `lord'
Keywords: 
New-files: {arch}/arch/arch--devo/arch--devo--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-34
  {arch}/arch/arch--lord/arch--lord--1.0/lord@regexps.com--2002/patch-log/patch-35
  {arch}/arch/arch--lord/arch--lord--1.0/lord@regexps.com--2002/patch-log/patch-36
  {arch}/arch/arch--lord/arch--lord--1.0/lord@regexps.com--2002/patch-log/patch-37
  {arch}/arch/arch--lord/arch--lord--1.0/lord@regexps.com--2002/patch-log/patch-38
  {arch}/arch/arch--lord/arch--lord--1.0/lord@regexps.com--2002/patch-log/patch-39
  manual/development-paths.doc
Removed-files: manual/lines-of-development.doc
Modified-files: =NEWS =TODO ChangeLog
  ChangeLog.d/lord@regexps.com--2002/ChangeLog.lord--1.0
  ChangeLog.d/lord@regexps.com--2002/ChangeLog.lord-doc--1.0
  archive-transactions/commit.sh archive-transactions/get.sh
  branching-and-merging/reconcile.sh manual/arch.doc
  manual/archives.doc manual/basic-branching-and-merging.doc
  manual/basic-rc.doc manual/idempotent-merging.doc
  manual/implementing-policies.doc manual/introduction.doc
  manual/logs-after-merging.doc manual/overview.doc
  manual/patch-logs.doc manual/preparing-to-merge.doc
  manual/project-names.doc manual/reconciling.doc
  manual/star-topology.doc manual/theory-of-patches.doc
  patch-logs/changelog.sh patch-sets/dopatch.sh
New-patches: lord@regexps.com--2002/arch--devo--1.0--patch-13
  lord@regexps.com--2002/arch--lord--1.0--patch-34
  lord@regexps.com--2002/arch--lord--1.0--patch-35
  lord@regexps.com--2002/arch--lord--1.0--patch-36
  lord@regexps.com--2002/arch--lord--1.0--patch-37
  lord@regexps.com--2002/arch--lord--1.0--patch-38
  lord@regexps.com--2002/arch--lord--1.0--patch-39

Patches applied:

  * lord@regexps.com--2002/arch--lord--1.0--patch-39
     =TODO update

  * lord@regexps.com--2002/arch--lord--1.0--patch-38
     avoid trademark litigation

  * lord@regexps.com--2002/arch--lord--1.0--patch-37
     =TODO changes

  * lord@regexps.com--2002/arch--lord--1.0--patch-36
     `head -c 1' is not Posix, and typos

  * lord@regexps.com--2002/arch--lord--1.0--patch-35
     merge from `devo'

  * lord@regexps.com--2002/arch--lord--1.0--patch-34
     merge from `devo'

