← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-02-28 15:42:55 UTC
  • mfrom: (1558.1.17 Aaron's integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060228154255-36bfbc3781202122
Merge fixes to the remerge command

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
31
31
import bzrlib.errors as errors
32
32
from bzrlib.errors import (BzrError, BzrCheckError, BzrCommandError, 
33
33
                           NotBranchError, DivergedBranches, NotConflicted,
34
 
                           NoSuchFile, NoWorkingTree, FileInWrongBranch)
 
34
                           NoSuchFile, NoWorkingTree, FileInWrongBranch,
 
35
                           NotVersionedError)
35
36
from bzrlib.log import show_one_log
36
37
from bzrlib.merge import Merge3Merger
37
38
from bzrlib.option import Option
1798
1799
                interesting_ids = set()
1799
1800
                for filename in file_list:
1800
1801
                    file_id = tree.path2id(filename)
 
1802
                    if file_id is None:
 
1803
                        raise NotVersionedError(filename)
1801
1804
                    interesting_ids.add(file_id)
1802
1805
                    if tree.kind(file_id) != "directory":
1803
1806
                        continue