← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/interrepository_implementations/test_fetch.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/interrepository_implementations/test_fetch.py
69
69
                if tree.inventory[file_id].kind == "file":
70
70
                    tree.get_file(file_id).read()
71
71
 
72
 
        # makes a target version repo 
 
72
        # makes a target version repo
73
73
        repo_b = self.make_to_repository('b')
74
74
        check_push_rev1(repo_b)
75
75
 
104
104
        except (errors.BzrCheckError, errors.RevisionNotPresent), e:
105
105
            # If an exception is raised, the revision should not be in the
106
106
            # target.
107
 
            # 
 
107
            #
108
108
            # Can also just raise a generic check errors; stream insertion
109
109
            # does this to include all the missing data
110
110
            self.assertRaises((errors.NoSuchRevision, errors.RevisionNotPresent),
140
140
        source_tree = self.make_branch_and_tree('source')
141
141
        source = source_tree.branch.repository
142
142
        target = self.make_to_repository('target')
143
 
    
 
143
 
144
144
        # start by adding a file so the data knit for the file exists in
145
145
        # repositories that have specific files for each fileid.
146
146
        self.build_tree(['source/id'])