← 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 12:10:39 UTC
  • Revision ID: aaron.bentley@utoronto.ca-20060830121039-8f45160e33322b5f
Partial fix for bzr.dev fix

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:'
627
628
                # if we want it to be in revision-history, do that here.
628
 
                target_tree.add_pending_merge(revision_id(missing_ancestor))
629
 
                missing_ancestor = None
 
629
                target_tree.set_parent_ids([missing_ancestor],
 
630
                                           allow_leftmost_parent_ghost=True)
630
631
            for merged_rev in direct_merges:
631
632
                target_tree.add_pending_merge(revision_id(merged_rev))
632
633
            target_tree.set_inventory(baz_inv)