I just committed a redo of Rebase.py and test_rebase.py. The old output won't pass, but I'm not sure when to post the new output, because of the newline problem with Python 2.1. Cayte