[PATCH] Sort removes first when applying updates (fixes issues 750 and 912)

Patrick Mézard pmezard at gmail.com
Mon Jul 7 06:20:04 CDT 2008


Paul Moore a écrit :
>>> I'll incorporate this (hopefully tonight) and re-post. I'll also try
>>> to persuade the test suite to run for me on Windows (:-)) and confirm
>>> there are no other issues there.
> 
> I've merged in the test change and resent, but haven't run the tests
> on Windows. The Windows testing patch queue doesn't apply cleanly to
> current crew tip, and I'm afraid I don't have time to rebase it
> tonight.

Done, as of b599557f0347.

I will take a look at this patch as soon as I can.

> PS Are the Windows testing patches ever likely to be merged into
> Mercurial, so there's no need for this rigmarole of rebasing and
> applying the patch series? It's not hard, but I often find it takes
> more (manual) effort than I have time for, as compared to simply
> firing off a test run.

Yes and no. The inclusion of these fixes is made on a test basis (and when I am in the mood of doing so. Do not hesitate to tell me you feel such or such fix could reasonably go in mainline). When I feel the fix is simple enough and unlikely to be broken by a Unix committer, I try to commit it. The other approach is to change Mercurial or the test suite (including pysh) to make the discrepancies disappear. For instance, I embedded paths rewriting code in pysh, called on selected mercurial commands. I agree it makes Windows test more painful to run.

What is even more annoying is they cannot be run in parallel because the --job argument is implemented on top of spawnvpe() and os.wait(). Replacing it (in the win32 patch queue) with subprocess does not seem simple. I will take a look at the "processing" module, maybe it can solve this.

--
Patrick Mézard


More information about the Mercurial-devel mailing list