/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/patiencediff.py

  • Committer: Matt Giuca
  • Date: 2011-11-20 01:50:38 UTC
  • mto: This revision was merged to the branch mainline in revision 6282.
  • Revision ID: matt.giuca@gmail.com-20111120015038-mln5c1in153786le
bzrlib.timestamp: Better error message if the string is missing a timezone offset.
If it is a valid time stamp but without an offset, the error message specifically mentions that that is the problem.
This gives better feedback when using --commit-time.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/patiencediff.py
73
73
     four
74
74
    """
75
75
    if sequencematcher is None:
76
 
        import difflib
77
76
        sequencematcher = difflib.SequenceMatcher
78
77
 
79
78
    if fromfiledate: