[PATCH 1 of 5] resolve: accepts walkopts (-I and -X)
S. Heimberg
simohe at besonet.ch
Wed Aug 6 15:12:13 CDT 2008
# HG changeset patch
# User simohe at besonet.ch
# Date 1217694460 -7200
# Node ID 629d5d5537351e81cd8010d039c8c47a35718c1f
# Parent cbdfd08eabc96116d801d0e2e7d1856adfdde911
resolve: accepts walkopts (-I and -X)
diff -r cbdfd08eabc9 -r 629d5d553735 mercurial/commands.py
--- a/mercurial/commands.py Tue Jul 22 13:03:31 2008 -0500
+++ b/mercurial/commands.py Sat Aug 02 18:27:40 2008 +0200
@@ -2242,7 +2242,7 @@
R = resolved
"""
- if len([x for x in opts if opts[x]]) > 1:
+ if len([x for x in opts if opts[x] == True]) > 1:
raise util.Abort(_("too many options specified"))
ms = merge_.mergestate(repo)
@@ -3207,7 +3207,8 @@
(resolve,
[('l', 'list', None, _('list state of files needing merge')),
('m', 'mark', None, _('mark files as resolved')),
- ('u', 'unmark', None, _('unmark files as resolved'))],
+ ('u', 'unmark', None, _('unmark files as resolved')),]
+ + walkopts,
('hg resolve [OPTION] [FILES...]')),
"revert":
(revert,
More information about the Mercurial-devel
mailing list