# HG changeset patch
# User Simon Heimberg <[email protected]>
# Date 1250506284 -7200
# Node ID 0b533d29360c3143cb4a6f03ed7e5d92071875b2
# Parent 21378f1666a1c6a8df8fdda2c297614d2b93a5fc
status: fix resolve and unmark in context menu
(broken since 0dbc7cd494a8)
diff -r 21378f1666a1 -r 0b533d29360c hggtk/status.py
--- a/hggtk/status.py Sam Aug 15 20:51:22 2009 -0500
+++ b/hggtk/status.py Mon Aug 17 12:51:24 2009 +0200
@@ -1263,7 +1263,7 @@
for wfile in files:
ms.mark(util.pconvert(wfile), "r")
self.reload_status()
- def resolve(self, stat, wfile):
+ def resolve(stat, files):
wctx = self.repo[None]
mctx = wctx.parents()[-1]
for wfile in files:
@@ -1301,8 +1301,8 @@
if len(all) == 1:
make(_('_copy'), copy, 'MC')
make(_('rename'), rename, 'MC')
- make(_('restart merge'), resolve, 'r')
- make(_('mark unresolved'), mark, 'r')
+ make(_('restart merge'), resolve, 'u')
+ make(_('mark unresolved'), unmark, 'r')
make(_('mark resolved'), mark, 'u')
for label, func, stats in self.get_custom_menus():
------------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
