~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: John Arbash Meinel
  • Date: 2007-07-10 20:07:33 UTC
  • mto: This revision was merged to the branch mainline in revision 2601.
  • Revision ID: john@arbash-meinel.com-20070710200733-ihnfsn13afibbs6w
Update WT4._iter_changes to not split the basename, since it will
never contain a '/' character.

Show diffs side-by-side

added added

removed removed

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