Commits

Steve Borho committed 629151f

merge: make 'discard other changes' harder to check on accident

Comments (0)

Files changed (1)

tortoisehg/hgtk/merge.py

         self.otherframe = info
         self.otherrev = str(info.get_data('revnum'))
 
+        discard = gtk.CheckButton(_('Discard all changes from merge target '
+                                    '(other) revision'))
+        self.discard = discard
+        self.vbox.pack_start(discard, False, False)
+
         info = factory(rev0, style={'label': _('Current revision (local)')})
         self.vbox.pack_start(info, False, False)
         self.localframe = info
         self.localrev = str(info.get_data('revnum'))
 
-        discard = gtk.CheckButton(_('Discard all changes from merge target '
-                                    '(other) revision'))
-        self.discard = discard
-        self.vbox.pack_start(discard, False, False)
-
         vlist = gtk.ListStore(str,  # tool name
                               bool) # separator
         combo = gtk.ComboBoxEntry(vlist, 0)