← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/changeset.py

  • Committer: Aaron Bentley
  • Date: 2005-10-03 18:57:48 UTC
  • mfrom: (1185.10.12)
  • mto: (1185.25.1)
  • mto: This revision was merged to the branch mainline in revision 1419.
  • Revision ID: abentley@panoramicfeedback.com-20051003185748-af821606b098e40d
Merged latest from bzr.24

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/changeset.py
357
357
        else:
358
358
            assert(status == 1)
359
359
            def get_lines(filename):
360
 
                my_file = file(base, "rb")
 
360
                my_file = file(filename, "rb")
361
361
                lines = my_file.readlines()
362
362
                my_file.close()
 
363
                return lines
363
364
            base_lines = get_lines(base)
364
365
            other_lines = get_lines(other)
365
366
            conflict_handler.merge_conflict(new_file, filename, base_lines,