/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 bzrlib/delta.py

Merge from bzr.dev.  Breaks a few tests because there are new methods not yet implemented.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/delta.py
344
344
        exe_change = False
345
345
        # files are "renamed" if they are moved or if name changes, as long
346
346
        # as it had a value
347
 
        if None not in name and (name[0] != name[1] or
348
 
                                 parent_id[0] != parent_id[1]):
 
347
        if None not in name and None not in parent_id and\
 
348
            (name[0] != name[1] or parent_id[0] != parent_id[1]):
349
349
            renamed = True
350
350
        else:
351
351
            renamed = False