[PATCH] convert: fix cvsnt mergepoint referring synthetic parent

Greg Ward greg-hg at gerg.ca
Fri Jun 5 21:32:56 CDT 2009


On Fri, Jun 5, 2009 at 10:06 PM, Greg Ward<greg-hg at gerg.ca> wrote:
> On Thu, Jun 4, 2009 at 12:24 AM, Henrik Stuart<hg at hstuart.dk> wrote:
>> It's more likely that it's a matter of missing sleep instructions. My
>> machine is adequately slow so I don't get any errors. Could you verify
>> that you don't have any local changes and then try to add a "sleep 1"
>> instruction in the cvscall function and see whether that fixes it.
>
> Oh yeah, I forgot about that.  Working on a patch now.

Never mind.  I give up on making this test work.  CVS is too damn
unreliable -- it just behaves differently from run to run no matter
how many sleeps I put in. ;-(

(OK, OK, I maxed out at "sleep 1" before and after every "cvs ci".
Seems excessive but it still didn't work.)

So I'm going to send in a patch that renames
test-convert-cvs-builtincvsps-cvsnt-mergepoints and makes it execute,
but does nothing about the fact that it fails.  Not sure if anyone
will want to push that patch, but it's there for the taking.  At least
it will expose the broken test.

Greg



More information about the Mercurial-devel mailing list