Revision: tlacontrib--devo--1.2--patch-29
Archive: jblack@inframix.com--2004
Creator: James Blackwell <jblack@merconline.com>
Date: Tue Mar  9 18:10:25 EST 2004
Standard-date: 2004-03-09 23:10:25 GMT
New-files: aba/commands/conflicts aba/commands/tree-source
Modified-files: aba/aba-lib aba/commands/change-version
    aba/commands/merge
New-patches: aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-66
    aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-67
    aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-68
    aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-69
    aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-70
    jblack@inframix.com--2004/tlacontrib--devo--1.2--patch-29
Summary: Various changes to aba (Bentley)
Keywords: 

Various changes to aba (Bentley)

Patches applied:

 * aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-66
   Made change-version die on errors

 * aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-67
   Prevented merging untouched trees

 * aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-68
   Added "aba conflicts" command

 * aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-69
   Added tree-source command, with aba_tree_source in aba-lib

 * aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-70
   Enhancements to aba merge