Submitter | Augie Fackler |
---|---|
Date | Oct. 9, 2015, 5:44 p.m. |
Message ID | <20151009174425.GC12600@arthedain.local> |
Download | mbox | patch |
Permalink | /patch/10916/ |
State | Superseded |
Commit | c60dfcc0abf2fadad062511a6c17837c8a1271f7 |
Headers | show |
Comments
On Fri, Oct 09, 2015 at 01:44:26PM -0400, Augie Fackler wrote: > On Fri, Oct 09, 2015 at 03:29:35PM +0300, Emanuele Giaquinta wrote: > > # HG changeset patch > > # User Emanuele Giaquinta <emanuele.giaquinta@gmail.com> > > # Date 1444206832 -10800 > > # Wed Oct 07 11:33:52 2015 +0300 > > # Node ID 724877229b9a3b513c0f325bb362626d6ed46210 > > # Parent a024e2db4553492e173032f52464e2c4efe0d4fa > > cvsps: fix computation of parent revisions when log caching is on > > With this applied I'm seeing consistent failures of test-convert-cvs.t like this: > > --- /home/augie/hg/tests/test-convert-cvs.t > +++ /home/augie/hg/tests/test-convert-cvs.t.err > @@ -344,10 +344,6 @@ > $ cvscall -q remove -f b/c > cvs remove: use 'cvs commit' to remove this file permanently > $ cvscall -q commit -mci > - Checking in a; > - $TESTTMP/cvsrepo/src/a,v <-- a > - new revision: 1.3; previous revision: 1.2 > - done > Removing b/c; > $TESTTMP/cvsrepo/src/b/c,v <-- c > new revision: delete; previous revision: 1.3 > @@ -357,8 +353,8 @@ > > $ hg debugcvsps --fuzz=2 -u > collecting CVS rlog > - 13 log entries > - cvslog hook: 13 entries > + 12 log entries > + cvslog hook: 12 entries > creating changesets > 11 changeset entries > cvschangesets hook: 11 changesets > @@ -498,7 +494,6 @@ > ci > > Members: > - a:1.2->1.3 > b/c:1.3->1.4(DEAD) This part belongs to the new test: it seems that cvs did not commit the change to file 'a', weird. On which system/cvs version do you get this? I have just found a different problem in the test with cvs-1.12.13 (I originally tested it with cvs-1.11.23): there are small differences in the output of cvs remove/commit between the two versions, and I have to account for them. I'll send an updated patch once we sort out the above failure. Emanuele
Patch
--- /home/augie/hg/tests/test-convert-cvs.t +++ /home/augie/hg/tests/test-convert-cvs.t.err @@ -344,10 +344,6 @@ $ cvscall -q remove -f b/c cvs remove: use 'cvs commit' to remove this file permanently $ cvscall -q commit -mci - Checking in a; - $TESTTMP/cvsrepo/src/a,v <-- a - new revision: 1.3; previous revision: 1.2 - done Removing b/c; $TESTTMP/cvsrepo/src/b/c,v <-- c new revision: delete; previous revision: 1.3 @@ -357,8 +353,8 @@ $ hg debugcvsps --fuzz=2 -u collecting CVS rlog - 13 log entries - cvslog hook: 13 entries + 12 log entries + cvslog hook: 12 entries creating changesets 11 changeset entries cvschangesets hook: 11 changesets @@ -498,7 +494,6 @@ ci Members: - a:1.2->1.3 b/c:1.3->1.4(DEAD)