Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

guess: Qt branch version of dd46dd176e9d

Changeset d84e6c9a0f22…

Parent 85c37416b3aa…

by Steve Borho

Changes to one file · Browse files at d84e6c9a0f22 Showing diff from parent 85c37416b3aa Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​guess.py Stacked
 
239
240
241
 
242
243
244
 
249
250
251
252
253
 
 
254
255
256
 
239
240
241
242
243
244
245
 
250
251
252
 
 
253
254
255
256
257
@@ -239,6 +239,7 @@
  def acceptMatch(self):   'User pressed "accept match" button'   remdests = {} + wctx = self.repo[None]   for index in self.matchtv.selectionModel().selectedRows():   src, dest, percent = self.matchtv.model().getRow(index)   if dest in remdests: @@ -249,8 +250,8 @@
  remdests[dest] = src   for dest, src in remdests.iteritems():   if not os.path.exists(self.repo.wjoin(src)): - self.repo.remove([src]) # !->R - self.repo.copy(src, dest) + wctx.remove([src]) # !->R + wctx.copy(src, dest)   shlib.shell_notify([self.repo.wjoin(src), self.repo.wjoin(dest)])   self.matchtv.model().remove(dest)   self.matchAccepted.emit()