Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

merge: use demandimport friendly import practices

Changeset c69cc47e6d79…

Parent 849e147d073b…

by Steve Borho

Changes to one file · Browse files at c69cc47e6d79 Showing diff from parent 849e147d073b Diff from another changeset...

Change 1 of 3 Show Entire File hggtk/​merge.py Stacked
 
10
11
12
13
 
14
15
16
 
201
202
203
204
 
205
206
207
 
227
228
229
230
 
231
232
233
 
10
11
12
 
13
14
15
16
 
201
202
203
 
204
205
206
207
 
227
228
229
 
230
231
232
233
@@ -10,7 +10,7 @@
 from mercurial.node import short, nullrev  from mercurial.i18n import _  from mercurial import util, hg, ui -from hgcmd import CmdDialog +import hgcmd  import shlib  import histselect  import hglib @@ -201,7 +201,7 @@
    cmdline = ['hg', 'update', '-R', self.root, '--rev', rev,   '--clean', '--verbose'] - dlg = CmdDialog(cmdline) + dlg = hgcmd.CmdDialog(cmdline)   dlg.run()   dlg.hide()   if self.notify_func: @@ -227,7 +227,7 @@
  if force:   cmdline.append("--force")   - dlg = CmdDialog(cmdline) + dlg = hgcmd.CmdDialog(cmdline)   dlg.run()   dlg.hide()   shlib.shell_notify([self.root])