Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

Merge with stable

Changeset 30fe5c13e017…

Parents 33d98e9a82de…

Parents e4326e10facf…

by Steve Borho

Changes to 2 files · Browse files at 30fe5c13e017 Showing diff from parent 33d98e9a82de e4326e10facf Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​chunks.py Stacked
 
209
210
211
212
 
213
214
215
 
209
210
211
 
212
213
214
215
@@ -209,7 +209,7 @@
  wlock = repo.wlock()   try:   repo.wopener(self.currentFile, 'wb').write( - self.diffbrowse.origcontents) + hglib.fromunicode(self.diffbrowse.origcontents))   fp = cStringIO.StringIO()   chunks[0].write(fp)   for c in kchunks:
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​fileview.py Stacked
 
640
641
642
 
643
644
645
 
640
641
642
643
644
645
646
@@ -640,6 +640,7 @@
  self.error = 'binary file'   else:   self.contents = hglib.tounicode(data) + if status in ('I', '?'):   self.flabel += _(' <i>(is unversioned)</i>')   except EnvironmentError, e:   self.error = hglib.tounicode(str(e))