/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/osutils.py

  • Committer: Vincent Ladeuil
  • Date: 2010-02-02 08:36:12 UTC
  • mto: (4797.10.1 2.1)
  • mto: This revision was merged to the branch mainline in revision 5000.
  • Revision ID: v.ladeuil+lp@free.fr-20100202083612-eckp9epabk9arhwu
More tests.

* bzrlib/tests/test_merge_core.py:
(MergeBuilder.add_dir): Allows adding a directory in some trees
only.

* bzrlib/tests/test_merge.py:
(TestConfigurableFileMerger): Add more tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/osutils.py