[PATCH] convert: fix cvsnt mergepoint referring synthetic parent

Henrik Stuart hg at hstuart.dk
Sat Jun 6 17:29:00 CDT 2009


Greg Ward skrev:
> Progress!  With the patch I just sent
> ("test-convert-cvsnt-mergepoints: ignore differences between CVS 1.11
> and 1.12"), the test now behaves the same under CVS 1.11 and 1.12.
> 
> On the slow PowerMac running NetBSD and CVS 1.11, it now passes 10/10 times.
> 
> On the fast Xeon server with CVS 1.11, it still fails 10/10 times ...
> but the failure is similar to the intermittent failures I'm seeing
> with CVS 1.12 on medium-speed hardware.  That is, CVS ignores one of
> the early commit commands, causing havoc.

Perhaps we could just fix that with cvs ci -f rather than all sorts of
timestamp hackery?

Also, I hear you on the "i hate cvs..." thing. :o) cvsps is broken
beyond belief. :o(

-- 
Kind regards,
  Henrik Stuart


More information about the Mercurial-devel mailing list