Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

stable merge: fix issue on merging

'otherrev' and 'localrev' must be strings since those are used for
command line parameters. Previous get_data('revnum') calling returns
string value, but it was changed at <b525951171bc> to provide raw data.

Changeset a673bfbfc502…

Parent c9350f487512…

by Yuki KODAMA

Changes to one file · Browse files at a673bfbfc502 Showing diff from parent c9350f487512 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​merge.py Stacked
 
82
83
84
85
 
86
87
88
89
90
 
91
92
93
 
82
83
84
 
85
86
87
88
89
 
90
91
92
93
@@ -82,12 +82,12 @@
  info = factory(rev1, style={'label': _('Merge target (other)')})   self.vbox.pack_start(info, False, False)   self.otherframe = info - self.otherrev = info.get_data('revnum') + self.otherrev = str(info.get_data('revnum'))     info = factory(rev0, style={'label': _('Current revision (local)')})   self.vbox.pack_start(info, False, False)   self.localframe = info - self.localrev = info.get_data('revnum') + self.localrev = str(info.get_data('revnum'))     # buttons   self.mergebtn = self.add_button(_('Merge'), RESPONSE_MERGE)