← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/add.py

  • Committer: Robert Collins
  • Date: 2005-10-10 23:18:27 UTC
  • mfrom: (1437)
  • mto: This revision was merged to the branch mainline in revision 1438.
  • Revision ID: robertc@robertcollins.net-20051010231827-f9e2dda2e92bf565
merge from upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/add.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
 
17
from os.path import dirname
 
18
 
 
19
import bzrlib.errors as errors
17
20
from bzrlib.inventory import InventoryEntry
18
21
from bzrlib.trace import mutter, note, warning
19
22
from bzrlib.errors import NotBranchError
20
23
from bzrlib.branch import Branch
21
24
from bzrlib.osutils import quotefn
22
 
from os.path import dirname
23
25
 
24
26
def glob_expand_for_win32(file_list):
25
27
    import glob
116
118
                sub_tree = True
117
119
            except NotBranchError:
118
120
                sub_tree = False
 
121
            except errors.UnsupportedFormatError:
 
122
                sub_tree = True
119
123
        else:
120
124
            sub_tree = False
121
125