← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/bundle_data.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-03-09 22:57:21 UTC
  • mfrom: (1551.12.48 mergedirective)
  • Revision ID: pqm@pqm.ubuntu.com-20070309225721-d395866527ca9a47
Add support for merge directives

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/bundle_data.py
112
112
        split up, based on the assumptions that can be made
113
113
        when information is missing.
114
114
        """
115
 
        from bzrlib.bundle.serializer import unpack_highres_date
 
115
        from bzrlib.timestamp import unpack_highres_date
116
116
        # Put in all of the guessable information.
117
117
        if not self.timestamp and self.date:
118
118
            self.timestamp, self.timezone = unpack_highres_date(self.date)