Revision: tlacontrib--devo--1.2--patch-31
Archive: jblack@inframix.com--2004
Creator: James Blackwell <jblack@merconline.com>
Date: Mon Mar 15 22:49:39 EST 2004
Standard-date: 2004-03-16 03:49:39 GMT
New-files: aba/commands/cdiff aba/commands/colorize
    aba/commands/star-merge-undo
Modified-files: aba/aba aba/aba-lib aba/commands/conflicts
    aba/commands/cvs-sync-inventory aba/commands/init-tree
    aba/commands/merge aba/commands/tag-this
    aba/commands/tree-revision
New-patches: aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-71
    aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-72
    aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-73
    aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-74
    aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-75
    aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-76
    aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-77
    aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-78
    aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-79
    aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-80
    aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-81
    aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-82
    aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-83
    aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-84
    bulb@ucw.cz--pub-1/tlacontrib--bulb--1.2--patch-19
    bulb@ucw.cz--pub-1/tlacontrib--bulb--1.2--patch-20
    bulb@ucw.cz--pub-1/tlacontrib--bulb--1.2--patch-21
    bulb@ucw.cz--pub-1/tlacontrib--bulb--1.2--patch-22
    bulb@ucw.cz--pub-1/tlacontrib--bulb--1.2--patch-23
    bulb@ucw.cz--pub-1/tlacontrib--bulb--1.2--patch-24
    bulb@ucw.cz--pub-1/tlacontrib--bulb--1.2--patch-25
    bulb@ucw.cz--pub-1/tlacontrib--bulb--1.2--patch-26
    bulb@ucw.cz--pub-1/tlacontrib--bulb--1.2--patch-27
    jblack@inframix.com--2004/tlacontrib--devo--1.2--patch-31
Summary: Integration with tla-sh, other aba improvements (Bentley)
Keywords: 

Integration with tla-sh, other aba improvements (Bentley)

Patches applied:

 * aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-71
   Pulled in Jblack's merge.  Trees are now unhosed!

 * aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-72
   Added star-merge-undo command

 * aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-73
   Added some status messages to star-merge-undo

 * aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-74
   cdiff, plus fixes for cvs-sync-inventory, tree-revision (bulb)

 * aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-75
   Improved error handling in aba merge

 * aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-76
   added colorize filter

 * aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-77
   Fixed conflicts display for colorize and conflicts

 * aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-78
   Fixed "conflicts" for whitespace and hidden files

 * aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-79
   Fixed aba so it doesn't try to execute directories (!)

 * aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-80
   Modified aba-lib so scripts can be stand-alone

 * aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-81
   Fixed the 'don't execute a directory' fix

 * aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-82
   Tweaked the conflicts command to resemble tla output more

 * aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-83
   Made merge do a log-for-merge even if there were conflicts

 * aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-84
   Merge w/ jblack

 * bulb@ucw.cz--pub-1/tlacontrib--bulb--1.2--patch-19
   Fixed cvs-sync-inventory

 * bulb@ucw.cz--pub-1/tlacontrib--bulb--1.2--patch-20
   cdiff command

 * bulb@ucw.cz--pub-1/tlacontrib--bulb--1.2--patch-21
   As usualy, forgot debugging in.

 * bulb@ucw.cz--pub-1/tlacontrib--bulb--1.2--patch-22
   Bashification

 * bulb@ucw.cz--pub-1/tlacontrib--bulb--1.2--patch-23
   Merge with mainline

 * bulb@ucw.cz--pub-1/tlacontrib--bulb--1.2--patch-24
   Merge with abebtley's trunk

 * bulb@ucw.cz--pub-1/tlacontrib--bulb--1.2--patch-25
   cdiff checks diffstat

 * bulb@ucw.cz--pub-1/tlacontrib--bulb--1.2--patch-26
   Added tree-revision to aba-lib

 * bulb@ucw.cz--pub-1/tlacontrib--bulb--1.2--patch-27
   Make cdiff run in perl 5.6