← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: John Arbash Meinel
  • Date: 2007-04-19 20:05:32 UTC
  • mfrom: (2428 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2432.
  • Revision ID: john@arbash-meinel.com-20070419200532-4v2yyd7oqq03gl2s
Resolve NEWS conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
38
38
 
39
39
from cStringIO import StringIO
40
40
import os
 
41
import sys
41
42
 
42
43
from bzrlib.lazy_import import lazy_import
43
44
lazy_import(globals(), """
119
120
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
120
121
CONFLICT_HEADER_1 = "BZR conflict list format 1"
121
122
 
 
123
ERROR_PATH_NOT_FOUND = 3    # WindowsError errno code, equivalent to ENOENT
 
124
 
122
125
 
123
126
@deprecated_function(zero_thirteen)
124
127
def gen_file_id(name):
2119
2122
            current_disk = disk_iterator.next()
2120
2123
            disk_finished = False
2121
2124
        except OSError, e:
2122
 
            if e.errno != errno.ENOENT:
 
2125
            if not (e.errno == errno.ENOENT or
 
2126
                (sys.platform == 'win32' and e.errno == ERROR_PATH_NOT_FOUND)):
2123
2127
                raise
2124
2128
            current_disk = None
2125
2129
            disk_finished = True