~rom1-chal/bzr-builder/reporting_conflict_from_merge

Viewing all changes in revision 99.

  • Committer: Romain Chalumeau
  • Date: 2010-07-16 15:52:48 UTC
  • Revision ID: rchalumeau@echo.fr-20100716155248-jfhcmbzx1tag5ngz
Tests updates
Take into account the new exceptions raised ConflictsDetected and ConflictsFromMerge
in tests : 
test_build_tree_merged_with_conflicts
test_pull_or_branch_pull_with_conflicts

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: