← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.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/diff.py
30
30
    osutils,
31
31
    patiencediff,
32
32
    textfile,
 
33
    timestamp,
33
34
    )
34
35
""")
35
36
 
490
491
 
491
492
def _patch_header_date(tree, file_id, path):
492
493
    """Returns a timestamp suitable for use in a patch header."""
493
 
    tm = time.gmtime(tree.get_file_mtime(file_id, path))
494
 
    return time.strftime('%Y-%m-%d %H:%M:%S +0000', tm)
 
494
    return timestamp.format_patch_date(tree.get_file_mtime(file_id, path))
495
495
 
496
496
 
497
497
def _raise_if_nonexistent(paths, old_tree, new_tree):