/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: John Arbash Meinel
  • Date: 2009-01-06 16:16:52 UTC
  • mto: This revision was merged to the branch mainline in revision 3923.
  • Revision ID: john@arbash-meinel.com-20090106161652-mmiu620z0uwuq659
It turns out that internal_diff worked around the trailing whitespace problem
from unified_diff, so we have to remove that workaround.
Also, the filename should be separated from the date by a tab character, not by a blank
space.

Show diffs side-by-side

added added

removed removed

Lines of Context:
77
77
        sequencematcher = difflib.SequenceMatcher
78
78
 
79
79
    if fromfiledate:
80
 
        fromfiledate = ' ' + str(fromfiledate)
 
80
        fromfiledate = '\t' + str(fromfiledate)
81
81
    if tofiledate:
82
 
        tofiledate = ' ' + str(tofiledate)
 
82
        tofiledate = '\t' + str(tofiledate)
83
83
 
84
84
    started = False
85
85
    for group in sequencematcher(None,a,b).get_grouped_opcodes(n):