/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/delta.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/delta.py
330
330
        exe_change = False
331
331
        # files are "renamed" if they are moved or if name changes, as long
332
332
        # as it had a value
333
 
        if None not in change.name and None not in change.parent_id and\
334
 
                (change.name[0] != change.name[1] or change.parent_id[0] != change.parent_id[1]):
335
 
            if change.copied:
336
 
                copied = True
337
 
                renamed = False
338
 
            else:
339
 
                renamed = True
340
 
                copied = False
 
333
        if change.copied:
 
334
            copied = True
 
335
            renamed = False
 
336
        elif change.renamed:
 
337
            renamed = True
 
338
            copied = False
341
339
        else:
342
340
            copied = False
343
341
            renamed = False