/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/bundle/apply_bundle.py

  • Committer: Robert Collins
  • Date: 2006-07-03 08:12:23 UTC
  • mfrom: (1832 +trunk)
  • mto: (1832.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 1833.
  • Revision ID: robertc@robertcollins.net-20060703081223-b106037c3fb29160
Merge from integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/apply_bundle.py
13
13
    pb = bzrlib.ui.ui_factory.nested_progress_bar()
14
14
    repository.lock_write()
15
15
    try:
16
 
        real_revisions = bundle_reader.info.real_revisions
 
16
        real_revisions = bundle_reader.real_revisions
17
17
        for i, revision in enumerate(reversed(real_revisions)):
18
18
            pb.update("Install revisions",i, len(real_revisions))
19
19
            if repository.has_revision(revision.revision_id):
38
38
        merger.pp = pp
39
39
        merger.pp.next_phase()
40
40
        merger.check_basis(check_clean, require_commits=False)
41
 
        merger.other_rev_id = reader.info.target
42
 
        merger.other_tree = merger.revision_tree(reader.info.target)
43
 
        merger.other_basis = reader.info.target
 
41
        merger.other_rev_id = reader.target
 
42
        merger.other_tree = merger.revision_tree(reader.target)
 
43
        merger.other_basis = reader.target
44
44
        merger.pp.next_phase()
45
45
        merger.find_base()
46
46
        if merger.base_rev_id == merger.other_rev_id: