← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/branch_implementations/test_pull.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_pull.py
29
29
class TestPull(TestCaseWithBranch):
30
30
 
31
31
    def test_pull_convergence_simple(self):
32
 
        # when revisions are pulled, the left-most accessible parents must 
 
32
        # when revisions are pulled, the left-most accessible parents must
33
33
        # become the revision-history.
34
34
        parent = self.make_branch_and_tree('parent')
35
35
        parent.commit('1st post', rev_id='P1', allow_pointless=True)
127
127
 
128
128
    def capture_post_pull_hook(self, result):
129
129
        """Capture post pull hook calls to self.hook_calls.
130
 
        
 
130
 
131
131
        The call is logged, as is some state of the two branches.
132
132
        """
133
133
        if result.local_branch:
161
161
    def test_post_pull_bound_branch(self):
162
162
        # pulling to a bound branch should pass in the master branch to the
163
163
        # hook, allowing the correct number of emails to be sent, while still
164
 
        # allowing hooks that want to modify the target to do so to both 
 
164
        # allowing hooks that want to modify the target to do so to both
165
165
        # instances.
166
166
        target = self.make_branch('target')
167
167
        local = self.make_branch('local')