← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/branch_implementations/test_push.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_push.py
18
18
 
19
19
from cStringIO import StringIO
20
20
import os
21
 
 
 
21
 
22
22
from bzrlib import (
23
23
    branch,
24
24
    builtins,
41
41
class TestPush(TestCaseWithBranch):
42
42
 
43
43
    def test_push_convergence_simple(self):
44
 
        # when revisions are pushed, the left-most accessible parents must 
 
44
        # when revisions are pushed, the left-most accessible parents must
45
45
        # become the revision-history.
46
46
        mine = self.make_branch_and_tree('mine')
47
47
        mine.commit('1st post', rev_id='P1', allow_pointless=True)
165
165
 
166
166
    def test_push_overwrite_of_non_tip_with_stop_revision(self):
167
167
        """Combining the stop_revision and overwrite options works.
168
 
        
 
168
 
169
169
        This was <https://bugs.launchpad.net/bzr/+bug/234229>.
170
170
        """
171
171
        source = self.make_branch_and_tree('source')
233
233
 
234
234
    def capture_post_push_hook(self, result):
235
235
        """Capture post push hook calls to self.hook_calls.
236
 
        
 
236
 
237
237
        The call is logged, as is some state of the two branches.
238
238
        """
239
239
        if result.local_branch:
267
267
    def test_post_push_bound_branch(self):
268
268
        # pushing to a bound branch should pass in the master branch to the
269
269
        # hook, allowing the correct number of emails to be sent, while still
270
 
        # allowing hooks that want to modify the target to do so to both 
 
270
        # allowing hooks that want to modify the target to do so to both
271
271
        # instances.
272
272
        target = self.make_branch('target')
273
273
        local = self.make_branch('local')