1. 05 Oct, 2001 1 commit
  2. 04 Oct, 2001 11 commits
  3. 03 Oct, 2001 3 commits
  4. 02 Oct, 2001 5 commits
  5. 28 Sep, 2001 6 commits
  6. 26 Sep, 2001 1 commit
    • Jeremy Hylton's avatar
      Be more specific about exception begin caugh in test_merge(). · e8b65ac4
      Jeremy Hylton authored
      The only exceptions that an _p_resolveConflict() method should raise
      are ConflictError and ValueError.  If it raises a different exception,
      then it has failed.
      
      In general, a unittest should not use a bare except clause, because
      they almost always mask failures.  If the test really means to catch
      all exceptions, it's best to make a comment to that effect.
      e8b65ac4
  7. 21 Sep, 2001 1 commit
  8. 20 Sep, 2001 2 commits
  9. 18 Sep, 2001 1 commit
  10. 13 Sep, 2001 1 commit
  11. 12 Sep, 2001 3 commits
  12. 07 Sep, 2001 5 commits