~bzr-pqm/bzr/bzr.dev

Merge bzr.dev

added added

removed removed

2267

# the file on disk is not present at all in the

2268

# dirblock. Either way, report about the dirblock

2269

# entry, and let other code handle the filesystem one.

2270

if current_path_info[1].split('/') < current_entry[0][1].split('/'):

2270

2271

# Compare the basename for these files to determine

2272

# which comes first

2273

if current_path_info[1] < current_entry[0][1]:

2271

2274

# extra file on disk: pass for now, but only

2272

2275

# increment the path, not the entry

2273

2276

advance_entry = False