← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-04-26 15:39:04 UTC
  • mfrom: (2456.2.6 rename_iter_changes_109993)
  • Revision ID: pqm@pqm.ubuntu.com-20070426153904-l91p9ybsqpxt2vyv
(John Arbash Meinel) Fix bug #109993 by fixing _iter_changes to not sync an on-disk file with an 'absent' dirblock record.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
2294
2294
                            # this check should probably be outside the loop: one
2295
2295
                            # 'iterate two trees' api, and then _iter_changes filters
2296
2296
                            # unchanged pairs. - RBC 20070226
2297
 
                            path_handled = True
 
2297
                            if current_entry[1][target_index][0] == 'a':
 
2298
                                advance_path = False
 
2299
                                path_handled = False
 
2300
                            else:
 
2301
                                path_handled = True
2298
2302
                            if (include_unchanged
2299
2303
                                or result[2]                    # content change
2300
2304
                                or result[3][0] != result[3][1] # versioned status