← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to baz_import.py

  • Committer: Robert Collins
  • Date: 2006-03-07 23:37:14 UTC
  • mfrom: (147.1.71 bzrtools)
  • mto: (364.1.3 bzrtools)
  • mto: This revision was merged to the branch mainline in revision 366.
  • Revision ID: robertc@robertcollins.net-20060307233714-79a35108099f3766
Merge from ab-baz2bzr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
baz_import.py
407
407
                               dir=os.path.dirname(output_dir))
408
408
    try:
409
409
        wt = WorkingTree.open(output_dir)
410
 
    except NotBranchError:
 
410
    except (NotBranchError, NoWorkingTree):
411
411
        wt = None
412
412
    if wt is None:
413
413
        old_basis = EmptyTree()
636
636
                             message=log_message.decode('ascii', 'replace'), 
637
637
                             verbose=False, committer=log_creator,
638
638
                             timestamp=timestamp, timezone=0, rev_id=rev_id,
639
 
                             revprops={'branch-nick': str(revision.version)})
 
639
                             revprops={})
640
640
        finally:
641
641
            target_tree.unlock()
642
642
            branch.unlock()