Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0, 2.0.1, and 2.0.2

stable merge: remove status checking "Stop" button - it doesn't actually do anything.

It isn't clear to me what we would do if we made it actually kill the thread, it
we wouldn't be able to say that the WD is clean or warn that it isn't.

Changeset d9823cd4f915…

Parent e92031f2f9ed…

by Daniel Atallah

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

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​merge.py Stacked
 
263
264
265
266
267
268
269
270
271
 
263
264
265
 
 
 
266
267
268
@@ -263,9 +263,6 @@
  wd_prog.setTextVisible(False)   self.groups.add(wd_prog, 'prog')   wdbox.addWidget(wd_prog, 1) - wd_button = QPushButton(_('Stop')) - self.groups.add(wd_button, 'prog') - wdbox.addWidget(wd_button)   wd_detail = QLabel(_('<a href="view">View changes...</a>'))   wd_detail.linkActivated.connect(self.link_activated)   self.groups.add(wd_detail, 'detail')