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

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

Changeset 629151fda3fb…

Parent c61160b75e0d…

by Steve Borho

Changes to one file · Browse files at 629151fda3fb Showing diff from parent c61160b75e0d Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​merge.py Stacked
 
81
82
83
 
 
 
 
 
84
85
86
87
88
89
90
91
92
93
94
95
96
 
81
82
83
84
85
86
87
88
89
90
91
92
93
 
 
 
 
 
94
95
96
@@ -81,16 +81,16 @@
  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)