← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/changeset.py

  • Committer: Robert Collins
  • Date: 2005-10-06 22:15:52 UTC
  • mfrom: (1185.13.2)
  • mto: This revision was merged to the branch mainline in revision 1420.
  • Revision ID: robertc@robertcollins.net-20051006221552-9b15c96fa504e0ad
merge from upstream

Show diffs side-by-side

added added

removed removed

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