[PATCH 1 of 5] resolve: accepts walkopts (-I and -X)

Dirkjan Ochtman dirkjan at ochtman.nl
Thu Aug 7 02:17:45 CDT 2008


Simon Heimberg <simohe <at> besonet.ch> writes:
> Brendan Cully thought me that "1 == True" returns True. This could be a
> problem in the feature. "opts[s] is True" would avoid this. But now I
> prefer an explicit list of the exclusive arguments. Do you agree?

Yes, I think the current way is not that clear.

I had your patch sitting in my repo, btw, but couldn't push it because the
testsuite was crapping out for unrelated reasons (probably a messed up install).

Also, I added a test, which you should do (this was my naive addition):

--- a/tests/test-merge9
+++ b/tests/test-merge9
@@ -44,6 +44,11 @@
 echo % after
 hg resolve -l

+echo % resolve matching
+hg resolve -u baz
+hg resolve -I baz -X bar
+hg resolve -l
+
 echo % resolve all
 hg resolve

And, finally, it would be nice if you could set your username to the hg
convention of Name <email>.

Thanks!

Dirkjan



More information about the Mercurial-devel mailing list