← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to baz_import.py

Branch.commit->WorkingTree.commit

Show diffs side-by-side

added added

removed removed

Lines of Context:
baz_import.py
587
587
        try:
588
588
            if missing_ancestor:
589
589
                # if we want it to be in revision-history, do that here.
590
 
                branch.add_pending_merge(revision_id(missing_ancestor))
 
590
                target_tree.add_pending_merge(revision_id(missing_ancestor))
591
591
                missing_ancestor = None
592
592
            for merged_rev in direct_merges:
593
 
                branch.add_pending_merge(revision_id(merged_rev))
 
593
                target_tree.add_pending_merge(revision_id(merged_rev))
594
594
            target_tree.set_inventory(baz_inv)
595
595
            commitobj = Commit(reporter=ImportCommitReporter(pb))
596
596
            commitobj.commit(branch, log_message.decode('ascii', 'replace'),