Revision: arch--geisler--1.0--patch-9
Archive: geisler@ece.nwu.edu--public
Creator: Jonathan Geisler <geisler@ece.nwu.edu>
Date: Sat Feb 16 08:23:30 CST 2002
Standard-date: 2002-02-16
Summary: merge with src (private)
Keywords: 
New-files: {arch}/arch/arch--geisler/arch--geisler--1.0/geisler@ece.nwu.edu--public/patch-log/patch-9
  {arch}/arch/arch--geisler/arch--geisler--1.0/geisler@ece.nwu.edu--src/patch-log/base-0
  {arch}/arch/arch--geisler/arch--geisler--1.0/geisler@ece.nwu.edu--src/patch-log/patch-1
  {arch}/arch/arch--geisler/arch--geisler--1.0/geisler@ece.nwu.edu--src/patch-log/patch-10
  {arch}/arch/arch--geisler/arch--geisler--1.0/geisler@ece.nwu.edu--src/patch-log/patch-11
  {arch}/arch/arch--geisler/arch--geisler--1.0/geisler@ece.nwu.edu--src/patch-log/patch-12
  {arch}/arch/arch--geisler/arch--geisler--1.0/geisler@ece.nwu.edu--src/patch-log/patch-15
  {arch}/arch/arch--geisler/arch--geisler--1.0/geisler@ece.nwu.edu--src/patch-log/patch-16
  {arch}/arch/arch--geisler/arch--geisler--1.0/geisler@ece.nwu.edu--src/patch-log/patch-5
  {arch}/arch/arch--geisler/arch--geisler--1.0/geisler@ece.nwu.edu--src/patch-log/patch-6
  {arch}/arch/arch--geisler/arch--geisler--1.0/geisler@ece.nwu.edu--src/patch-log/patch-7
  {arch}/arch/arch--geisler/arch--geisler--1.0/geisler@ece.nwu.edu--src/patch-log/patch-8
  {arch}/arch/arch--geisler/arch--geisler--1.0/geisler@ece.nwu.edu--src/patch-log/patch-9
Modified-files: 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
  branching-and-merging/reconcile.sh
  branching-and-merging/tag.sh
  branching-and-merging/whats-missing.sh
  inventory/inventory.sh patch-sets/mkpatch.sh
New-patches: geisler@ece.nwu.edu--public/arch--geisler--1.0--patch-9
  geisler@ece.nwu.edu--src/arch--geisler--1.0--base-0
  geisler@ece.nwu.edu--src/arch--geisler--1.0--patch-1
  geisler@ece.nwu.edu--src/arch--geisler--1.0--patch-10
  geisler@ece.nwu.edu--src/arch--geisler--1.0--patch-11
  geisler@ece.nwu.edu--src/arch--geisler--1.0--patch-12
  geisler@ece.nwu.edu--src/arch--geisler--1.0--patch-15
  geisler@ece.nwu.edu--src/arch--geisler--1.0--patch-16
  geisler@ece.nwu.edu--src/arch--geisler--1.0--patch-5
  geisler@ece.nwu.edu--src/arch--geisler--1.0--patch-6
  geisler@ece.nwu.edu--src/arch--geisler--1.0--patch-7
  geisler@ece.nwu.edu--src/arch--geisler--1.0--patch-8
  geisler@ece.nwu.edu--src/arch--geisler--1.0--patch-9

This is the manual merging that Tom gave directions for in README.025 .
This should catch the two branches up and allow them to star-merge with
each other.

Patches applied:

  * geisler@ece.nwu.edu--src/arch--geisler--1.0--patch-16
     merge with pre8

  * geisler@ece.nwu.edu--src/arch--geisler--1.0--patch-15
     merge with pre7

  * geisler@ece.nwu.edu--src/arch--geisler--1.0--patch-12
     Add --debug to whats-missing

  * geisler@ece.nwu.edu--src/arch--geisler--1.0--patch-11
     merge with pre6

  * geisler@ece.nwu.edu--src/arch--geisler--1.0--patch-10
     bug fix

  * geisler@ece.nwu.edu--src/arch--geisler--1.0--patch-9
     pass debug on to child invocations

  * geisler@ece.nwu.edu--src/arch--geisler--1.0--patch-8
     simplified column checking

  * geisler@ece.nwu.edu--src/arch--geisler--1.0--patch-7
     add --debug to inventory

  * geisler@ece.nwu.edu--src/arch--geisler--1.0--patch-6
     check for column correctly everywhere

  * geisler@ece.nwu.edu--src/arch--geisler--1.0--patch-5
     accomodate Solaris join bug

  * geisler@ece.nwu.edu--src/arch--geisler--1.0--patch-1
     bug fix

  * geisler@ece.nwu.edu--src/arch--geisler--1.0--patch-10
     bug fix

  * geisler@ece.nwu.edu--src/arch--geisler--1.0--patch-11
     merge with pre6

  * geisler@ece.nwu.edu--src/arch--geisler--1.0--patch-12
     Add --debug to whats-missing

  * geisler@ece.nwu.edu--src/arch--geisler--1.0--patch-13
     bug fix

  * geisler@ece.nwu.edu--src/arch--geisler--1.0--patch-14
     bug fix

  * geisler@ece.nwu.edu--src/arch--geisler--1.0--patch-15
     merge with pre7

  * geisler@ece.nwu.edu--src/arch--geisler--1.0--patch-16
     merge with pre8

  * geisler@ece.nwu.edu--src/arch--geisler--1.0--base-0
     create arch--geisler--1.0 from mailine

