/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/git/tree.py

  • Committer: Jelmer Vernooij
  • Date: 2020-08-15 22:46:49 UTC
  • mto: (7490.40.103 work)
  • mto: This revision was merged to the branch mainline in revision 7521.
  • Revision ID: jelmer@jelmer.uk-20200815224649-5xdaij8k1ojygidh
Some fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/tree.py
957
957
            else:
958
958
                newparentpath, newname = osutils.split(newpath_decoded)
959
959
                newparent = mapping.generate_file_id(newparentpath)
960
 
#        if (not include_unchanged and
961
 
#                oldkind == 'directory' and newkind == 'directory' and
962
 
#                oldpath_decoded == newpath_decoded):
963
 
#            continue
 
960
        if (not include_unchanged and
 
961
                oldkind == 'directory' and newkind == 'directory' and
 
962
                oldpath_decoded == newpath_decoded):
 
963
            continue
964
964
        if oldversioned and change_type != 'copy':
965
965
            fileid = mapping.generate_file_id(oldpath_decoded)
966
966
        elif newversioned: