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

  • Committer: Jelmer Vernooij
  • Date: 2020-09-02 16:35:18 UTC
  • mto: (7490.40.109 work)
  • mto: This revision was merged to the branch mainline in revision 7526.
  • Revision ID: jelmer@jelmer.uk-20200902163518-sy9f4unbboljphgu
Handle duplicate directories entries for git.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/transform.py
732
732
        """Cancel the creation of new file contents."""
733
733
        raise NotImplementedError(self.cancel_creation)
734
734
 
735
 
    def apply(self, no_conflicts=False, precomputed_delta=None, _mover=None):
 
735
    def apply(self, no_conflicts=False, _mover=None):
736
736
        """Apply all changes to the inventory and filesystem.
737
737
 
738
738
        If filesystem or inventory conflicts are present, MalformedTransform
742
742
 
743
743
        :param no_conflicts: if True, the caller guarantees there are no
744
744
            conflicts, so no check is made.
745
 
        :param precomputed_delta: An inventory delta to use instead of
746
 
            calculating one.
747
745
        :param _mover: Supply an alternate FileMover, for testing
748
746
        """
749
747
        raise NotImplementedError(self.apply)