← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tag.py

(jelmer) Fix reporting all tags as changed when using --overwrite. (Jelmer
 Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tag.py
344
344
        updates = {}
345
345
        result = dict(dest_dict) # copy
346
346
        for name, target in source_dict.items():
347
 
            if name not in result or overwrite:
 
347
            if result.get(name) == target:
 
348
                pass
 
349
            elif name not in result or overwrite:
 
350
                updates[name] = target
348
351
                result[name] = target
349
 
                updates[name] = target
350
 
            elif result[name] == target:
351
 
                pass
352
352
            else:
353
353
                conflicts.append((name, target, result[name]))
354
354
        return result, updates, conflicts