/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/tests/test_bzrdir.py

  • Committer: Vincent Ladeuil
  • Date: 2010-09-21 16:58:50 UTC
  • mto: (5502.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 5504.
  • Revision ID: v.ladeuil+lp@free.fr-20100921165850-fkrlj18p68l7xxz4
Revert to 'conflict' being the default orphaning policy and fix fallouts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bzrdir.py
791
791
        self.build_tree(['tree1/subtree/file'])
792
792
        sub_tree.add('file')
793
793
        tree.commit('Initial commit')
 
794
        # The following line force the orhaning to reveal bug #634470
 
795
        tree.branch.get_config().set_user_option(
 
796
            'bzrlib.transform.orphan_policy', 'move')
794
797
        tree.bzrdir.destroy_workingtree()
795
798
        # FIXME: subtree/.bzr is left here which allows the test to pass (or
796
799
        # fail :-( ) -- vila 20100909