# HG changeset patch
# User Yuki KODAMA <endflow....@gmail.com>
# Date 1252422658 -32400
# Node ID 6d5ed01491c2698991fedd77be6608dd09c04b2f
# Parent  9577a6b478af35ccced116f758751305588ea1f5
status: fix the name conflict

diff --git a/hggtk/status.py b/hggtk/status.py
--- a/hggtk/status.py
+++ b/hggtk/status.py
@@ -1369,7 +1369,7 @@
             self.rename_file(files[0])
         def copy(menuitem, files):
             self.copy_file(files[0])
-        def guess(menuitem, files):
+        def guess_rename(menuitem, files):
             dlg = guess.DetectRenameDialog()
             dlg.show_all()
             dlg.set_notify_func(self.ignoremask_updated)
@@ -1389,7 +1389,7 @@
         make(_('l_og'), log, 'MARC!ru')
         make(_('_forget'), forget, 'MARC!ru')
         make(_('_add'), add, 'I?')
-        make(_('_guess rename'), guess, '?')
+        make(_('_guess rename'), guess_rename, '?')
         make(_('_ignore'), ignore, '?')
         make(_('remove versioned'), remove, 'C')
         make(_('_delete unversioned'), delete, '?I')

Attachment: thg-kuy_rev3884.patch
Description: Binary data

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
_______________________________________________
Tortoisehg-develop mailing list
Tortoisehg-develop@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop

Reply via email to