/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/plugins/news_merge/README

  • Committer: Vincent Ladeuil
  • Date: 2009-04-08 19:06:40 UTC
  • mto: (4276.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4277.
  • Revision ID: v.ladeuil+lp@free.fr-20090408190640-ra8frcx4hj55qj02
Fix failure, add tests.

* bzrlib/tests/test_selftest.py:
(TestTestResult.test_startTests.InstrumentedTestResult): Check
that startTests is called once.
(TestRunSuite.test_runner_class): Check that
ExtendedTestResult.done() is called once.

* bzrlib/tests/blackbox/test_selftest.py:
(TestBenchmarkTests.test_benchmark_runs_benchmark_tests): Output
order has changed.

* bzrlib/tests/__init__.py:
(run_suite): At least subunit.TestProtocolClient doesn't define
done().

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/news_merge/README
1
 
A plugin for merging bzr's NEWS file.
2
 
 
3
 
This plugin is activated via configuration variables, see 'bzr help news_merge'.
4
 
 
5
 
This hook can resolve conflicts where both sides add entries at the same place.
6
 
If it encounters a more difficult conflict it gives up and bzr will fallback to
7
 
the default merge algorithm.