Breaking merge_tests.py into 3 parts

Frequently I want to test just the subset of merge_tests.py related to
--reintegrate as a quick sanity check during development for that
feature. To make this a bit easier I'd like to break merge_tests.py
into three separate tests:

  1) merge_reintegrate_tests.py - All merge --reintegrate tests

  2) merge_tree_conflicts_tests.py - All merge tests related to tree-conflicts

  3) merge_tests.py - Everything that doesn't fit in the other two

Any objections?

Paul
Received on 2010-05-26 20:23:52 CEST