Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0, 1.0.1, and 1.0.2

changeset: put "diff to second parent" on top of file tree area

was previously on the bottom

Changeset 9759d50bf517…

Parent 630fbcf61006…

by Adrian Buehlmann

Changes to one file · Browse files at 9759d50bf517 Showing diff from parent 630fbcf61006 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgtk/​changeset.py Stacked
 
101
102
103
 
104
105
106
107
108
 
703
704
705
706
707
708
709
710
 
711
712
713
 
101
102
103
104
105
 
106
107
108
 
703
704
705
 
706
 
707
708
709
710
711
712
@@ -101,8 +101,8 @@
  if len(parents) == 2:   # deferred adding of parent check button   if not self.parent_button.parent: + self.parent_box.pack_start(self.parent_button, False, False)   self.parent_box.pack_start(gtk.HSeparator(), False, False) - self.parent_box.pack_start(self.parent_button, False, False)   self.parent_box.show_all()     # show parent box @@ -703,11 +703,10 @@
  scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)   scroller.add(filelist_tree)   flbox = gtk.VBox() - flbox.pack_start(scroller)   list_frame.add(flbox) -   self.parent_box = gtk.VBox()   flbox.pack_start(self.parent_box, False, False) + flbox.pack_start(scroller)     btn = gtk.CheckButton(_('Diff to second Parent'))   btn.connect('toggled', self.parent_toggled)