/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

Fix merging of copy operations.

Merged from https://code.launchpad.net/~jelmer/brz/merge-copy/+merge/389688

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tree.py
158
158
            return (self.executable[0] != self.executable[1])
159
159
        return False
160
160
 
 
161
    @property
 
162
    def renamed(self):
 
163
        return (
 
164
            not self.copied and
 
165
            None not in self.name and
 
166
            self.path[0] != self.path[1])
 
167
 
161
168
    def is_reparented(self):
162
169
        return os.path.dirname(self.path[0]) != os.path.dirname(self.path[1])
163
170