Rev 2599: Update WT4._iter_changes to not split the basename, since it will in http://bzr.arbash-meinel.com/branches/bzr/0.19-dev/simple_no_split

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/0.19-dev/simple_no_split

------------------------------------------------------------
revno: 2599
revision-id: john at arbash-meinel.com-20070710200733-ihnfsn13afibbs6w
parent: pqm at pqm.ubuntu.com-20070710021221-8o98e4q8vcpaarnk
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: simple_no_split
timestamp: Tue 2007-07-10 15:07:33 -0500
message:
  Update WT4._iter_changes to not split the basename, since it will
  never contain a '/' character.
modified:
  bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
-------------- next part --------------
=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py	2007-06-06 06:11:58 +0000
+++ b/bzrlib/workingtree_4.py	2007-07-10 20:07:33 +0000
@@ -2265,7 +2265,10 @@
                         # the file on disk is not present at all in the
                         # dirblock. Either way, report about the dirblock
                         # entry, and let other code handle the filesystem one.
-                        if current_path_info[1].split('/') < current_entry[0][1].split('/'):
+
+                        # Compare the basename for these files to determine
+                        # which comes first
+                        if current_path_info[1] < current_entry[0][1]:
                             # extra file on disk: pass for now, but only
                             # increment the path, not the entry
                             advance_entry = False