← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to baz_import.py

  • Committer: Aaron Bentley
  • Date: 2006-08-23 21:03:05 UTC
  • Revision ID: abentley@panoramicfeedback.com-20060823210305-eb7e28ad8c6323b4
Remove useless merge_inner

Show diffs side-by-side

added added

removed removed

Lines of Context:
baz_import.py
421
421
                                   dir=os.path.dirname(output_dir))
422
422
        try:
423
423
            wt = WorkingTree.open(output_dir)
424
 
            old_last_revision = wt.last_revision()
425
424
        except (NotBranchError, NoWorkingTree):
426
425
            wt = None
427
 
            old_last_revision = None 
428
426
        try:
429
427
            for result in iter_import_version(output_dir, ancestors, tempdir,
430
428
                    pb=progress_bar,
442
440
                wt = None
443
441
            if wt is not None:
444
442
                wt.set_last_revision(wt.branch.last_revision())
445
 
                old_basis = \
446
 
                    wt.branch.repository.revision_tree(old_last_revision)
447
 
                merge_inner(wt.branch, wt.basis_tree(), old_basis, 
448
 
                            ignore_zero=True, this_tree=wt)
449
443
                wt.revert([])
450
444
    
451
445
        finally: