← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/dirstate.py

  • Committer: John Arbash Meinel
  • Date: 2007-05-21 11:36:38 UTC
  • mto: This revision was merged to the branch mainline in revision 2518.
  • Revision ID: john@arbash-meinel.com-20070521113638-3gnfdxspxklyv8bb
https://launchpad.net/bugs/115947
Fix bug #115947, DirState.set_state_from_inventory() needs to iterate in
the correct order when there are common prefixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/dirstate.py
1986
1986
                # both sides are dealt with, move on
1987
1987
                current_old = advance(old_iterator)
1988
1988
                current_new = advance(new_iterator)
1989
 
            elif new_entry_key < current_old[0]:
 
1989
            elif (new_entry_key[0].split('/') < current_old[0][0].split('/')
 
1990
                  and new_entry_key[1:] < current_old[0][1:]):
1990
1991
                # new comes before:
1991
1992
                # add a entry for this and advance new
1992
1993
                self.update_minimal(new_entry_key, current_new_minikind,