← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Aaron Bentley
  • Date: 2007-07-12 17:07:02 UTC
  • mfrom: (2590.3.1 changes-merge)
  • mto: This revision was merged to the branch mainline in revision 2617.
  • Revision ID: abentley@panoramicfeedback.com-20070712170702-kefnhuo926w6cvhz
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
2269
2269
                        # the file on disk is not present at all in the
2270
2270
                        # dirblock. Either way, report about the dirblock
2271
2271
                        # entry, and let other code handle the filesystem one.
2272
 
                        if current_path_info[1].split('/') < current_entry[0][1].split('/'):
 
2272
 
 
2273
                        # Compare the basename for these files to determine
 
2274
                        # which comes first
 
2275
                        if current_path_info[1] < current_entry[0][1]:
2273
2276
                            # extra file on disk: pass for now, but only
2274
2277
                            # increment the path, not the entry
2275
2278
                            advance_entry = False