← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/branch_implementations/test_parent.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/branch_implementations/test_parent.py
36
36
        """Branches should have no parent by default"""
37
37
        b = self.make_branch('.')
38
38
        self.assertEqual(None, b.get_parent())
39
 
        
 
39
 
40
40
    def test_set_get_parent(self):
41
41
        """Set, re-get and reset the parent"""
42
42
        b = self.make_branch('subdir')