← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tag.py

  • Committer: Jelmer Vernooij
  • Date: 2011-09-22 13:26:14 UTC
  • mto: This revision was merged to the branch mainline in revision 6160.
  • Revision ID: jelmer@samba.org-20110922132614-xzl96seq8s2heijb
Fix tests.

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:
348
 
                if name not in result:
349
 
                    updates[name] = target
 
347
            if result.get(name) == target:
 
348
                pass
 
349
            elif name not in result or overwrite:
 
350
                updates[name] = target
350
351
                result[name] = target
351
 
            elif result[name] == target:
352
 
                pass
353
352
            else:
354
353
                conflicts.append((name, target, result[name]))
355
354
        return result, updates, conflicts