/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 breezy/transform.py

  • Committer: Jelmer Vernooij
  • Date: 2018-11-16 12:25:18 UTC
  • mto: This revision was merged to the branch mainline in revision 7178.
  • Revision ID: jelmer@jelmer.uk-20181116122518-8tb1y9ul3joufu3d
Fix E128.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/transform.py
2622
2622
                        else:
2623
2623
                            divert.add(file_id)
2624
2624
                    if (file_id not in divert
2625
 
                        and _content_match(tree, entry, tree_path, file_id, kind,
2626
 
                                       target_path)):
 
2625
                        and _content_match(
 
2626
                            tree, entry, tree_path, file_id, kind,
 
2627
                            target_path)):
2627
2628
                        tt.delete_contents(tt.trans_id_tree_path(tree_path))
2628
2629
                        if kind == 'directory':
2629
2630
                            reparent = True