← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/export/dir_exporter.py

  • Committer: Martin Pool
  • Date: 2011-06-19 02:24:39 UTC
  • mfrom: (5985 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6001.
  • Revision ID: mbp@canonical.com-20110619022439-u68683yb2bw302x0
resolve conflicts against trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/export/dir_exporter.py
96
96
        if force_mtime is not None:
97
97
            mtime = force_mtime
98
98
        else:
99
 
            mtime = tree.get_file_mtime(tree.path2id(relpath), relpath)
 
99
            if subdir is None:
 
100
                file_id = tree.path2id(relpath)
 
101
            else:
 
102
                file_id = tree.path2id(osutils.pathjoin(subdir, relpath))
 
103
            mtime = tree.get_file_mtime(file_id, relpath)
100
104
        os.utime(fullpath, (mtime, mtime))
101
105
 
102
106
        yield