comparison mercurial/patch.py @ 10524:3212afb33116 stable

patch: fix patching with fuzz and eol normalization
author Patrick Mezard <pmezard@gmail.com>
date Mon, 22 Feb 2010 22:55:58 +0100
parents 5fe51d348daf
children e764f24a45ee 7a5931c5f2dc
comparison
equal deleted inserted replaced
10523:4bab7c3db4e1 10524:3212afb33116
655 655
656 # Dummy object, it is rebuilt manually 656 # Dummy object, it is rebuilt manually
657 nh = hunk(self.desc, self.number, None, None, False, False) 657 nh = hunk(self.desc, self.number, None, None, False, False)
658 nh.number = self.number 658 nh.number = self.number
659 nh.desc = self.desc 659 nh.desc = self.desc
660 nh.hunk = self.hunk
660 nh.a = normalize(self.a) 661 nh.a = normalize(self.a)
661 nh.b = normalize(self.b) 662 nh.b = normalize(self.b)
662 nh.starta = self.starta 663 nh.starta = self.starta
663 nh.startb = self.startb 664 nh.startb = self.startb
664 nh.lena = self.lena 665 nh.lena = self.lena