← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/fixtures.py

merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/fixtures.py
97
97
    def __exit__(self, exc_type, exc_val, exc_tb):
98
98
        self._calls.append('__exit__')
99
99
        return False # propogate exceptions.
 
100
 
 
101
 
 
102
def build_branch_with_non_ancestral_rev(branch_builder):
 
103
    """Builds a branch with a rev not in the ancestry of the tip.
 
104
 
 
105
    This is the revision graph::
 
106
 
 
107
      rev-2
 
108
        |
 
109
      rev-1
 
110
        |
 
111
      (null)
 
112
 
 
113
    The branch tip is 'rev-1'.  'rev-2' is present in the branch's repository,
 
114
    but is not part of rev-1's ancestry.
 
115
 
 
116
    :param branch_builder: A BranchBuilder (e.g. from
 
117
        TestCaseWithMemoryTransport.make_branch_builder).
 
118
    :returns: the new branch
 
119
    """
 
120
    # Make a sequence of two commits
 
121
    branch_builder.build_commit(message="Rev 1", rev_id='rev-1')
 
122
    branch_builder.build_commit(message="Rev 2", rev_id='rev-2')
 
123
    # Move the branch tip back to the first commit
 
124
    source = branch_builder.get_branch()
 
125
    source.set_last_revision_info(1, 'rev-1')
 
126
    return source
 
127