← 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-05-03 19:21:08 UTC
  • mto: This revision was merged to the branch mainline in revision 366.
  • Revision ID: abentley@panoramicfeedback.com-20060503192108-d01a4be5ddc139aa
Patch from robert to allow import into empty branches

Show diffs side-by-side

added added

removed removed

Lines of Context:
baz_import.py
287
287
        branch = Branch.open(output_dir)
288
288
        last_patch = get_last_revision(branch)
289
289
        if last_patch is None:
290
 
            raise NotPreviousImport(branch.base)
291
 
        if version is None:
 
290
            if branch.last_revision() != None:
 
291
                raise NotPreviousImport(branch.base)
 
292
        elif version is None:
292
293
            version = last_patch.version
293
294
    elif version is None:
294
295
        raise UserError("No version specified, and directory does not exist.")