← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: John Arbash Meinel
  • Date: 2006-09-12 22:59:53 UTC
  • mto: This revision was merged to the branch mainline in revision 2071.
  • Revision ID: john@arbash-meinel.com-20060912225953-6d8567932927b1e3
Change how 'revision' is imported to avoid problems later

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
31
31
        lockdir,
32
32
        lockable_files,
33
33
        osutils,
34
 
        revision,
 
34
        revision as _mod_revision,
35
35
        transport,
36
36
        tree,
37
37
        ui,
227
227
                    last_revision = from_history[-1]
228
228
                else:
229
229
                    # no history in the source branch
230
 
                    last_revision = revision.NULL_REVISION
 
230
                    last_revision = _mod_revision.NULL_REVISION
231
231
            return self.repository.fetch(from_branch.repository,
232
232
                                         revision_id=last_revision,
233
233
                                         pb=nested_pb)
1124
1124
        # make a new revision history from the graph
1125
1125
        current_rev_id = revision_id
1126
1126
        new_history = []
1127
 
        while current_rev_id not in (None, revision.NULL_REVISION):
 
1127
        while current_rev_id not in (None, _mod_revision.NULL_REVISION):
1128
1128
            new_history.append(current_rev_id)
1129
1129
            current_rev_id_parents = stop_graph[current_rev_id]
1130
1130
            try: