← 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-30 13:17:10 UTC
  • Revision ID: abentley@panoramicfeedback.com-20060830131710-2c25a1ac5230c2c4
Better fix for new API

Show diffs side-by-side

added added

removed removed

Lines of Context:
baz_import.py
624
624
        branch.lock_write()
625
625
        try:
626
626
            if missing_ancestor:
627
 
                assert missing_ancestor != 'null:'
628
627
                # if we want it to be in revision-history, do that here.
629
 
                target_tree.set_parent_ids([missing_ancestor],
630
 
                                           allow_leftmost_parent_ghost=True)
 
628
                target_tree.set_parent_ids([revision_id(missing_ancestor)],
 
629
                                           allow_leftmost_as_ghost=True)
 
630
                missing_ancestor = None
631
631
            for merged_rev in direct_merges:
632
632
                target_tree.add_pending_merge(revision_id(merged_rev))
633
633
            target_tree.set_inventory(baz_inv)