← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_join.py

  • Committer: John Arbash Meinel
  • Date: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_join.py
81
81
    def test_references_check_repository_support(self):
82
82
        """Users are stopped from adding a reference that can't be committed."""
83
83
        # in 0.15 the default format has a dirstate workingtree, that can
84
 
        # support tree references, but the default repository format 
 
84
        # support tree references, but the default repository format
85
85
        # cannot.
86
86
        tree = self.make_branch_and_tree('tree', format='dirstate')
87
87
        tree2 = self.make_branch_and_tree('tree/subtree')