2002-01-06  Tom Lord <lord@regexps.com>

    Summary:
      =TODO changes and final commit
    Revision:
      arch--devo--1.0--patch-17

    Final check-in to the --2001Q4 archive, prior to setting up
    the archive structure I'll use for a public release.
    

    modified files:
     =TODO ChangeLog


2002-01-06  Tom Lord <lord@regexps.com>

    Summary:
      `merge-points' command
    Revision:
      arch--devo--1.0--patch-16

    
    `merge-points': a new command that reports the merges from one branch
    to another, where the merged-into branch may be either an archived
    version or revision, or a project tree.
    
    Incremental documentation increases.
    
    `star-merge' has to use `merge-points' -- this was code accidently
    ommitted from the first `star-merge' commit.
    
    `record-config': fixed a trivial help message bug.
    
    `changelog': fixed a quoting bug.
    

    new files:
     manual/arbitrary-patching.doc manual/pristine-cache.doc
     manual/multi-tree-projects.doc patch-logs/merge-points.sh
     manual/preparing-to-merge.doc

    removed files:
     manual/preparing-to-merge.doc

    modified files:
     =TODO ChangeLog branching-and-merging/star-merge.sh
     configurations/record-config.sh manual/arch.doc
     manual/basic-branching-and-merging.doc manual/basic-rc.doc
     manual/idempotent-merging.doc manual/lines-of-development.doc
     manual/star-topology.doc patch-logs/Help.list.in
     patch-logs/changelog.sh

    renamed files:
     manual/star-merge.doc
       ==> manual/star-topology.doc



2002-01-05  Tom Lord <lord@regexps.com>

    Summary:
      star-merge
    Revision:
      arch--devo--1.0--patch-15

    This is the initial commit of (untested) `star-merge'.
    
    `star-merge' merges two branches which are ancestors of a project tree
    with the local changes in that tree.  It handles the (surprisingly)
    tricky case of two branches that merge with one-another repeatedly, as
    with a `trunk' and surrounding development or patch-review branches
    arranged in a star topology.
    
    In the `branching-and-merging' directory, `=merges' with `=lemmas'
    cryptically summarizes the math behind `star-merge'.
    
    In `tree-root --accurate', a subdirctory '{arch}/++resolve-conflicts'
    indicates a mid-merge working directory.  The file `cmd' explains how to 
    finish the merge operation.
    
    The command `with-archive-settings' prints a script that restores the
    environment variable settings of a `with-archive' session (useful for
    having more than one session active at a time).
    
    The command `arch patch-lvl-lt' compares patch level names for ordering.
    
    The command `arch delta-patch' computes a patch between an arbitrary
    choice of revisions or trees and applies the patch to a revision or
    tree.  It does not, yet, do the optimization(?) of generating a patch
    between ancestor and descendent revisions by combining existing patch
    sets.  (There is a `patchutils' distribution from someone at RH that
    might be helpful here, though at the moment it is gratuitously
    GNU-specific.)
    
    In `update' a trivial fix: don't call `bail' before it is defined.
    

    new files:
     manual/star-merge.doc branching-and-merging/star-merge.sh
     remote/with-archive-settings.sh
     naming-conventions/patch-level-lt.sh
     branching-and-merging/delta-patch.sh
     branching-and-merging/=lemmas branching-and-merging/=merges

    modified files:
     =TODO ChangeLog branching-and-merging/Help.list.in
     branching-and-merging/update.sh manual/arch.doc
     manual/basic-branching-and-merging.doc manual/reconciling.doc
     project-tree/tree-root.sh


2002-01-03  Tom Lord <lord@regexps.com>

    Summary:
      important notes in =TODO
    Revision:
      arch--devo--1.0--patch-14

    
    The plan for `arch merge' is in `=TODO'.  This commit is just to
    squirrel away a revision with that plan.
    

    modified files:
     =TODO ChangeLog


2002-01-03  Tom Lord <lord@regexps.com>

    Summary:
      don't restore timestamps from tar files
    Revision:
      arch--devo--1.0--patch-13

    Pass the `-m' to all `tar' invocations that extract files.
    
    If an archive is a different time zone, the timestamps can easily be
    in the future, which causes build problems.
    

    modified files:
     =TODO ChangeLog archive-transactions/build-by-patching.sh
     archive-transactions/commit.sh
     archive-transactions/copy-from-archive-cache.sh
     archive-transactions/copy-from-fresh-start-base.sh
     archive-transactions/get-patch.sh
     archives/archive-cache-revision.sh
     branching-and-merging/replay.sh branching-and-merging/tag.sh
     patch-sets/dopatch.sh


2002-01-03  Tom Lord <lord@regexps.com>

    Summary:
      bug fixes and new patch log
    Revision:
      arch--devo--1.0--patch-12

    Added a patch log for the public repository.
    
    In `update', fixed a bug that occured when the user's default archive
    is not the same as the tree archive.
    
    In `patch-report', fixed a bug handling the `--diffs' flag.
    

    new files:
     {arch}/arch/arch--devo/arch--devo--1.0/lord@regexps.com--public-2001Q4/patch-log/base-0
     configurations/=later/what-changed-config.sh

    modified files:
     =TODO ChangeLog branching-and-merging/update.sh
     patch-sets/patch-report.sh

    new directories:
     configurations/=later
     {arch}/arch/arch--devo/arch--devo--1.0/lord@regexps.com--public-2001Q4
     {arch}/arch/arch--devo/arch--devo--1.0/lord@regexps.com--public-2001Q4/patch-log

    new patches:
     lord@regexps.com--public-2001Q4/arch--devo--1.0--base-0


2002-01-03  Tom Lord <lord@regexps.com>

    Summary:
      buf fixes for remote access
    Revision:
      arch--devo--1.0--patch-11

    `revisions.sh': `wftp-ls' is touchy since servers don't 
    consistently implement `NLST' and `LIST'.  Ultimately,
    this should be smoothed out in `wftp-client' or `wftp-ls',
    but for now, don't ask for `ls' of `.' -- ask for `ls' of
    `<no-arguments>'.
    
    `find-in-cache.sh': allow a full-qualified version name.
    
    `what-changed.sh':  allow a full-qualified version name.
    

    modified files:
     =TODO ChangeLog archives/revisions.sh
     local-cache/find-in-cache.sh local-cache/what-changed.sh


2002-01-02  Tom Lord <lord@regexps.com>

    Summary:
      don't `unset IFS'
    Revision:
      arch--devo--1.0--patch-10

    Some old versions of `sh' apparently don't like it when you `unset
    IFS'.  Instead, save and restore the old value.
    
    (Also some incremental changes to the manual.)
    

    new files:
     manual/preparing-to-merge.doc manual/archive-format.doc

    modified files:
     =TODO ChangeLog manual/arch.doc patch-sets/dopatch.sh
     patch-sets/mkpatch.sh


2002-01-02  Tom Lord <lord@regexps.com>

    Summary:
      doc update
    Revision:
      arch--devo--1.0--patch-9

    
    Updated the user's guide, somewhat.
    

    modified files:
     =TODO ChangeLog manual/arch.doc manual/archives.doc
     manual/basic-branching-and-merging.doc manual/basic-rc.doc
     manual/implementing-policies.doc manual/in-general.doc
     manual/introduction.doc manual/patch-logs.doc
     manual/patches.doc manual/project-names.doc
     manual/reconciling.doc

    renamed files:
     manual/basic-operation.doc
       ==> manual/basic-rc.doc



2002-01-01  Tom Lord <lord@regexps.com>

    Summary:
      `arch changelog' and `commit' bug fix
    Revision:
      arch--devo--1.0--patch-8

    Slight output format fix to `changelog'.  Log entry files for the
    being-committed revision appeared (incorrectly) in the new file list.
    

    modified files:
     =TODO ChangeLog archive-transactions/commit.sh
     patch-logs/changelog.sh


2002-01-01  Tom Lord <lord@regexps.com>

    Summary:
      `arch join'
    Revision:
      arch--devo--1.0--patch-7

    `join': a new command for joining a sibling branch at the point
    of common ancestory (still needs to be tested).
    

    new files:
     branching-and-merging/join.sh

    modified files:
     =TODO ChangeLog branching-and-merging/Help.list.in
     manual/introduction.doc


2001-12-31  Tom Lord <lord@regexps.com>

    Summary:
      added missing file tags
    Revision:
      arch--devo--1.0--patch-6

    Oops.
    

    new files:
     input/PLUGIN/.arch-ids/REQ.id input/file-syntax-filter.sh
     input/PLUGIN/REQ

    removed files:
     input/PLUGIN/REQ input/file-syntax-filter.sh

    modified files:
     ChangeLog

    new directories:
     input/PLUGIN/.arch-ids


2001-12-31  Tom Lord <lord@regexps.com>

    Summary:
      config mgt. functionality
    Revision:
      arch--devo--1.0--patch-5

    
    Renamed `*-configuration' commands to `*-config'.
    
    `commit' no longer commits if the only changes are the new log file
    and changes to `ChangeLog' files.  The option `--unchanged-ok'
    overrides this.
    
    `mkpatch': trivial output format fix
    
    `file-syntax-filter': internal command for processing input config
    files that user's edit (can remove comments, blank lines, etc.)
    
    The `*-config' commands permit comments and blank lines now.
    
    `logs' takes a `--dir' option instead of an optional argument.
    
    `logs' has options to restrict the list to a particular archive,
    category, branch label, or version number.
    
    The `--reverse' option to `logs' now works, and versions are sorted
    by version number.
    
    `log-ls' now accepts a branch specification and lists entries in the
    latest (logged) version of that branch.
    
    `log-ls' now accepts a revision specification and lists only the
    log entry for that patch level.
    
    `record-config': new command that derives one config from another,
    filling in underspecified revisions from the patch logs of the tree.

    new files:
     input/PLUGIN/REQ input/file-syntax-filter.sh
     input/PLUGIN/Makefile.in input/Help.category.in
     input/Help.category_title.in input/Help.list.in
     input/Makefile.in configurations/record-config.sh

    modified files:
     =TODO ChangeLog archive-transactions/commit.sh
     configurations/Help.list.in configurations/build-config.sh
     configurations/replay-config.sh
     configurations/update-config.sh manual/in-general.doc
     manual/introduction.doc patch-logs/log-ls.sh
     patch-logs/logs.sh patch-sets/mkpatch.sh

    renamed files:
     configurations/build-configuration.sh
       ==> configurations/build-config.sh
     configurations/replay-configuration.sh
       ==> configurations/replay-config.sh
     configurations/update-configuration.sh
       ==> configurations/update-config.sh


    new directories:
     elisp-help input input/PLUGIN


2001-12-30  Tom Lord <lord@regexps.com>

    Summary:
      bug fix to copy-tree-precious
    Revision:
      arch--devo--1.0--patch-4

    
    Trivial syntax error.
    

    modified files:
     =TODO ChangeLog project-tree/copy-tree-precious.sh


2001-12-30  Tom Lord <lord@regexps.com>

    Summary:
      configuration mgt. bug fixes/features
    Revision:
      arch--devo--1.0--patch-3

    
    In `build-configuration', move conflicting dirs from bottom-up, 
    not top-down.
    
    In `update-' and `replay-configuration', there's no such thing
    as a conflicting directory, do don't move them out of the way.
    
    In `copy-tree-precious', copy entire nested project trees.
    
    In `udpate', with `--in-place', save the old dir as a backup
    dir, not a precious dir.
    

    modified files:
     =TODO ChangeLog branching-and-merging/update.sh
     configurations/Help.list.in
     configurations/build-configuration.sh
     configurations/replay-configuration.sh
     configurations/update-configuration.sh inventory/inventory.sh
     manual/inventory.doc project-tree/copy-tree-precious.sh


2001-12-29  Tom Lord <lord@regexps.com>

    Summary:
      multi-project configuration functions and minor bug fixes
    Revision:
      arch--devo--1.0--patch-2

    `build-configuration': new command which helps with checking-out a 
    multi-project tree.
    
    `update-configuration' and `replay-configuration': commands which 
    run `update' and `replay' on configured sub-trees. 
    
    In `body-indent', pass body content through expand so that
    added spaces at the beginnings of lines don't mess up tabs.
    
    In `get' -- hand `--'.
    
    In `update' -- require `--force' to update when the tree already 
    has the latest patch level.
    
    In `update' -- report `finish time'.
    

    new files:
     configurations/PLUGIN/.arch-ids/REQ.id
     configurations/Help.category.in
     configurations/Help.category_title.in
     configurations/Help.list.in configurations/Makefile.in
     configurations/build-configuration.sh
     configurations/replay-configuration.sh
     configurations/update-configuration.sh
     configurations/PLUGIN/REQ

    modified files:
     =TODO ChangeLog archive-transactions/get.sh
     branching-and-merging/update.sh output/body-indent.sh
     patch-sets/patch-report.sh

    new directories:
     configurations configurations/PLUGIN
     configurations/PLUGIN/.arch-ids


2001-12-29  Tom Lord <lord@regexps.com>

    Summary:
      bugfix in `import'
    Revision:
      arch--devo--1.0--patch-1

    
    Trivial fix to output formatting.
    

    modified files:
     ChangeLog archive-transactions/import.sh


2001-12-29  Tom Lord <lord@regexps.com>

    Summary:
      first import after tree restructuring
    Revision:
      arch--devo--1.0--base-0

    First import after tree restructuring.
    

    new files:
     ./=TODO ./=old-changelogs ./=old-changelogs/Changes--0.5
     ./ChangeLog ./Makefile.in ./PLUGIN ./PLUGIN/.arch-ids
     ./PLUGIN/.arch-ids/=dont-care ./PLUGIN/DIRS ./PLUGIN/REQ
     ./arch ./arch/Makefile.in ./arch/PLUGIN
     ./arch/PLUGIN/.arch-ids ./arch/PLUGIN/.arch-ids/=dont-care
     ./arch/PLUGIN/REQ ./arch/arch.sh.in ./archive-transactions
     ./archive-transactions/=former
     ./archive-transactions/=former/commit.sh
     ./archive-transactions/Help.category.in
     ./archive-transactions/Help.category_title.in
     ./archive-transactions/Help.list.in
     ./archive-transactions/Makefile.in
     ./archive-transactions/PLUGIN
     ./archive-transactions/PLUGIN/.arch-ids
     ./archive-transactions/PLUGIN/.arch-ids/=dont-care
     ./archive-transactions/PLUGIN/REQ
     ./archive-transactions/arch-rmrf.sh
     ./archive-transactions/build-by-patching.sh
     ./archive-transactions/build-revision.sh
     ./archive-transactions/commit.sh
     ./archive-transactions/copy-from-archive-cache.sh
     ./archive-transactions/copy-from-fresh-start-base.sh
     ./archive-transactions/get-patch.sh
     ./archive-transactions/get.sh ./archive-transactions/import.sh
     ./archive-transactions/lock-branch.sh
     ./archive-transactions/lock-revision.sh
     ./archive-transactions/make-lock.sh
     ./archive-transactions/putdir.sh
     ./archive-transactions/putlast.sh
     ./archive-transactions/wd-txn.sh ./archives
     ./archives/Help.category.in ./archives/Help.category_title.in
     ./archives/Help.list.in ./archives/Makefile.in
     ./archives/PLUGIN ./archives/PLUGIN/.arch-ids
     ./archives/PLUGIN/.arch-ids/=dont-care ./archives/PLUGIN/REQ
     ./archives/archive-cache-revision.sh
     ./archives/archive-cached-revisions.sh
     ./archives/archive-uncache-revision.sh ./archives/branches.sh
     ./archives/cat-archive-log.sh ./archives/categories.sh
     ./archives/get-archive-name.sh ./archives/make-archive.sh
     ./archives/make-branch.sh ./archives/make-category.sh
     ./archives/make-version.sh ./archives/noop.sh
     ./archives/previous-patch-level.sh ./archives/revisions.sh
     ./archives/versions.sh ./branching-and-merging
     ./branching-and-merging/=reconcile-cases
     ./branching-and-merging/=reconcile-cases/.arch-ids
     ./branching-and-merging/=reconcile-cases/.arch-ids/=default
     ./branching-and-merging/=reconcile-cases/.arch-ids/=id
     ./branching-and-merging/=reconcile-cases/other-test-A-C-B
     ./branching-and-merging/=reconcile-cases/other-test-B-A-C
     ./branching-and-merging/=reconcile-cases/test-case-A-B-C
     ./branching-and-merging/=reconcile-cases/test-case-A-C-B
     ./branching-and-merging/Help.category.in
     ./branching-and-merging/Help.category_title.in
     ./branching-and-merging/Help.list.in
     ./branching-and-merging/Makefile.in
     ./branching-and-merging/PLUGIN
     ./branching-and-merging/PLUGIN/.arch-ids
     ./branching-and-merging/PLUGIN/.arch-ids/=dont-care
     ./branching-and-merging/PLUGIN/REQ
     ./branching-and-merging/finish-branch.sh
     ./branching-and-merging/prepare-branch.sh
     ./branching-and-merging/reconcile.sh
     ./branching-and-merging/replay.sh
     ./branching-and-merging/tag.sh
     ./branching-and-merging/update.sh
     ./branching-and-merging/whats-missing.sh ./inventory
     ./inventory/.arch-ids ./inventory/Help.category.in
     ./inventory/Help.category_title.in ./inventory/Help.list.in
     ./inventory/Makefile.in ./inventory/PLUGIN
     ./inventory/PLUGIN/.arch-ids
     ./inventory/PLUGIN/.arch-ids/=dont-care ./inventory/PLUGIN/REQ
     ./inventory/add.sh ./inventory/check-manifest.sh
     ./inventory/delete.sh ./inventory/explicit-default.sh
     ./inventory/inventory-pkgtest.sh ./inventory/inventory.sh
     ./inventory/manifest.sh ./inventory/missing-tags.sh
     ./inventory/move.sh ./inventory/set-manifest.sh
     ./inventory/tagging-method.sh ./inventory/tree-lint.sh
     ./local-cache ./local-cache/Help.category.in
     ./local-cache/Help.category_title.in
     ./local-cache/Help.list.in ./local-cache/Makefile.in
     ./local-cache/PLUGIN ./local-cache/PLUGIN/.arch-ids
     ./local-cache/PLUGIN/.arch-ids/=dont-care
     ./local-cache/PLUGIN/REQ ./local-cache/add-pristine.sh
     ./local-cache/cache-dir.sh ./local-cache/cached-index.sh
     ./local-cache/copy-from-cache.sh
     ./local-cache/delete-pristine.sh ./local-cache/file-diffs.sh
     ./local-cache/find-in-cache.sh ./local-cache/lock-pristine.sh
     ./local-cache/make-cache-temp-dir.sh ./local-cache/old-file.sh
     ./local-cache/pristines.sh ./local-cache/take-from-cache.sh
     ./local-cache/wd-mv-pristine.sh
     ./local-cache/wd-new-patches.sh ./local-cache/what-changed.sh
     ./manual ./manual/Makefile.in ./manual/PLUGIN
     ./manual/PLUGIN/.arch-ids ./manual/PLUGIN/.arch-ids/=dont-care
     ./manual/PLUGIN/REQ ./manual/arch.doc ./manual/archives.doc
     ./manual/basic-branching-and-merging.doc
     ./manual/basic-operation.doc ./manual/data-sheet.doc
     ./manual/document-license.doc ./manual/idempotent-merging.doc
     ./manual/implementing-policies.doc ./manual/in-general.doc
     ./manual/indexes.doc ./manual/introduction.doc
     ./manual/inventory.doc ./manual/lines-of-development.doc
     ./manual/on-hacking.doc ./manual/overview.doc
     ./manual/patch-logs.doc ./manual/patch-set-format.doc
     ./manual/patches.doc ./manual/project-names.doc
     ./manual/project-trees.doc ./manual/reconciling.doc
     ./manual/source-license.doc ./manual/theory-of-patches.doc
     ./manual/user-names.doc ./naming-conventions
     ./naming-conventions/Help.category.in
     ./naming-conventions/Help.category_title.in
     ./naming-conventions/Help.list.in
     ./naming-conventions/Makefile.in ./naming-conventions/PLUGIN
     ./naming-conventions/PLUGIN/.arch-ids
     ./naming-conventions/PLUGIN/.arch-ids/=dont-care
     ./naming-conventions/PLUGIN/REQ
     ./naming-conventions/indicated-revision.sh
     ./naming-conventions/parse-package-name.sh
     ./naming-conventions/valid-archive-location.sh
     ./naming-conventions/valid-archive-name.sh
     ./naming-conventions/valid-id.sh
     ./naming-conventions/valid-package-name.sh
     ./naming-conventions/valid-patch-level-name.sh ./output
     ./output/Help.category.in ./output/Help.category_title.in
     ./output/Help.list.in ./output/Makefile.in ./output/PLUGIN
     ./output/PLUGIN/.arch-ids ./output/PLUGIN/.arch-ids/=dont-care
     ./output/PLUGIN/.arch-ids/=id ./output/PLUGIN/REQ
     ./output/body-indent.sh ./output/file-list.sh
     ./output/heading.sh ./output/nest.sh ./output/nested.sh
     ./patch-logs ./patch-logs/Help.category.in
     ./patch-logs/Help.category_title.in ./patch-logs/Help.list.in
     ./patch-logs/LOGS ./patch-logs/Makefile.in ./patch-logs/PLUGIN
     ./patch-logs/PLUGIN/.arch-ids
     ./patch-logs/PLUGIN/.arch-ids/=dont-care
     ./patch-logs/PLUGIN/REQ ./patch-logs/add-log.sh
     ./patch-logs/cat-log.sh ./patch-logs/changelog.sh
     ./patch-logs/copy-to-patch-log.sh
     ./patch-logs/log-header-field.sh ./patch-logs/log-ls.sh
     ./patch-logs/logs.sh ./patch-logs/make-log.sh
     ./patch-logs/valid-log-file.sh
     ./patch-logs/wd-check-for-patch-log.sh ./patch-sets
     ./patch-sets/DOPATCH ./patch-sets/Help.category.in
     ./patch-sets/Help.category_title.in ./patch-sets/Help.list.in
     ./patch-sets/Makefile.in ./patch-sets/PATCHES
     ./patch-sets/PLUGIN ./patch-sets/PLUGIN/.arch-ids
     ./patch-sets/PLUGIN/.arch-ids/=dont-care
     ./patch-sets/PLUGIN/REQ ./patch-sets/dopatch.sh
     ./patch-sets/empty-patch.sh ./patch-sets/mkpatch.sh
     ./patch-sets/patch-add-log.sh ./patch-sets/patch-report.sh
     ./project-tree ./project-tree/Help.category.in
     ./project-tree/Help.category_title.in
     ./project-tree/Help.list.in ./project-tree/Makefile.in
     ./project-tree/PLUGIN ./project-tree/PLUGIN/.arch-ids
     ./project-tree/PLUGIN/.arch-ids/=dont-care
     ./project-tree/PLUGIN/REQ ./project-tree/copy-or-stash.sh
     ./project-tree/copy-tree-precious.sh
     ./project-tree/init-tree.sh ./project-tree/set-tree-version.sh
     ./project-tree/tree-repair.sh ./project-tree/tree-root.sh
     ./project-tree/tree-version.sh ./remote
     ./remote/Help.category.in ./remote/Help.category_title.in
     ./remote/Help.list.in ./remote/Makefile.in ./remote/PLUGIN
     ./remote/PLUGIN/.arch-ids ./remote/PLUGIN/.arch-ids/=dont-care
     ./remote/PLUGIN/REQ ./remote/with-archive.sh ./user
     ./user/Help.category.in ./user/Help.category_title.in
     ./user/Help.list.in ./user/Makefile.in ./user/PLUGIN
     ./user/PLUGIN/.arch-ids ./user/PLUGIN/.arch-ids/=dont-care
     ./user/PLUGIN/REQ ./user/archives.sh
     ./user/my-default-archive.sh ./user/my-id.sh
     ./user/register-archive.sh ./user/whereis-archive.sh


# tag: Tom Lord Mon Jan  7 02:19:59 2002 (lord@regexps.com--2001Q4/ChangeLog.devo)
#
