/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: John Arbash Meinel
  • Date: 2007-04-26 18:53:33 UTC
  • mfrom: (2465 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2466.
  • Revision ID: john@arbash-meinel.com-20070426185333-i1xlyaeyf049kdxc
[merge] bzr.dev 2465

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