← Back to branch summary

~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-04-30 17:29:39 UTC
  • mto: (2472.2.2 dirstate_fixes)
  • mto: This revision was merged to the branch mainline in revision 2475.
  • Revision ID: john@arbash-meinel.com-20070430172939-hvjgsm1pinoawdy5
https://launchpad.net/bugs/111288
Fix bug #111288. When we don't have a match
don't consider the disk file processed. Because we need to
emit an 'unknown' record for it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
2268
2268
                                # this check should probably be outside the loop: one
2269
2269
                                # 'iterate two trees' api, and then _iter_changes filters
2270
2270
                                # unchanged pairs. - RBC 20070226
2271
 
                                path_handled = True
 
2271
                                # path_handled = True
2272
2272
                                if (include_unchanged
2273
2273
                                    or result[2]                    # content change
2274
2274
                                    or result[3][0] != result[3][1] # versioned status