← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: John Arbash Meinel
  • Date: 2006-07-31 19:15:36 UTC
  • mto: (1900.2.1 bzr.merge.54651)
  • mto: This revision was merged to the branch mainline in revision 1903.
  • Revision ID: john@arbash-meinel.com-20060731191536-ca772e434471e8cf
internal_diff always adds a trailing \n, make sure external_diff does too

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
180
180
                
181
181
            raise BzrError('external diff failed with %s; command: %r' 
182
182
                           % (rc, diffcmd))
 
183
 
 
184
        # internal_diff() adds a trailing newline, add one here for consistency
 
185
        to_file.write('\n')
 
186
 
183
187
    finally:
184
188
        oldtmpf.close()                 # and delete
185
189
        newtmpf.close()