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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2019-10-13 16:11:08 UTC
  • mfrom: (7397.2.4 ie-is-same)
  • Revision ID: breezy.the.bot@gmail.com-20191013161108-imzi2dmiz7g0jzha
Add a new ``TreeEntry.is_unmodified`` method, which allows
merge to check for unmodified files without relying
on the .revision attribute that is not available for Git trees.

This fixes LCA merges for Git repositories.

Merged from https://code.launchpad.net/~jelmer/brz/ie-is-same/+merge/373715

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tree.py
85
85
    def kind_character(self):
86
86
        return "???"
87
87
 
 
88
    def is_unmodified(self, other):
 
89
        """Does this entry reference the same entry?
 
90
 
 
91
        This is mostly the same as __eq__, but returns False
 
92
        for entries without enough information (i.e. revision is None)
 
93
        """
 
94
        return False
 
95
 
88
96
 
89
97
class TreeDirectory(TreeEntry):
90
98
    """See TreeEntry. This is a directory in a working tree."""