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 df6f8ccaac9f…

Parents c4691fba95aa…

Parents 59bb6f267b33…

by Steve Borho

Changes to one file · Browse files at df6f8ccaac9f Showing diff from parent c4691fba95aa 59bb6f267b33 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​chunks.py Stacked
 
639
640
641
642
 
 
643
644
645
 
690
691
692
693
 
694
695
 
639
640
641
 
642
643
644
645
646
 
691
692
693
 
694
695
696
@@ -639,7 +639,8 @@
  def displayFile(self, filename, status):   self.clearDisplay()   if filename == self._lastfile: - reenable = [c.fromline for c in self.curchunks[1:] if c.selected] + reenable = [(c.fromline, len(c.before)) for c in self.curchunks[1:]\ + if c.selected]   else:   reenable = []   self._lastfile = filename @@ -690,6 +691,6 @@
  self.countselected = 0   self.curchunks = chunks   for c in chunks[1:]: - if c.fromline in reenable: + if (c.fromline, len(c.before)) in reenable:   self.toggleChunk(c)   self.updateSummary()