← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/identitymap.py

  • Committer: Vincent Ladeuil
  • Date: 2012-01-16 17:57:43 UTC
  • mfrom: (6437.3.3 2.5)
  • mto: This revision was merged to the branch mainline in revision 6439.
  • Revision ID: v.ladeuil+lp@free.fr-20120116175743-ohoqm6cmht09u793
Merge 2.5 into trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/identitymap.py
17
17
 
18
18
"""This module provides an IdentityMap."""
19
19
 
 
20
from __future__ import absolute_import
20
21
 
21
22
from bzrlib import (
22
23
    errors,