~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to baz_import.py

  • Committer: Aaron Bentley
  • Date: 2006-03-07 14:13:49 UTC
  • mto: (147.4.31 trunk)
  • mto: This revision was merged to the branch mainline in revision 324.
  • Revision ID: abentley@panoramicfeedback.com-20060307141349-09932daa892c0005
Handle NoWorkingTree too

Show diffs side-by-side

added added

removed removed

Lines of Context:
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()