bug-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

RE: Is there really any interest in a patch to allow cvs 1.11.6 torun


From: Kelly F. Hickel
Subject: RE: Is there really any interest in a patch to allow cvs 1.11.6 torun
Date: Mon, 6 Oct 2003 16:02:45 -0500

> -----Original Message-----
> From: Paul Edwards [mailto:address@hidden
> Sent: Friday, October 03, 2003 5:28 PM
> To: address@hidden
> Subject: Re: Is there really any interest in a patch to allow cvs
1.11.6
> torun
> 
> "Kelly F. Hickel" <address@hidden> wrote in message
> news:address@hidden
> > |FAIL: basica-6.2
> > |make[2]: *** [localcheck] Error 1
> > |make[2]: Leaving directory `/usr/local/cvs/cvs-1.11.6_nsk/src'
> > |make[1]: *** [check-am] Error 2
> > |make[1]: Leaving directory `/usr/local/cvs/cvs-1.11.6_nsk/src'
> > |make: *** [check-recursive] Error 1
> > |/usr/local/cvs/cvs-1.11.6_nsk:
> > |
> > |How much does this matter?
> 
> That is a context diff failing.
> 
> ie cvs diff -c <filename>
> 
> not producing expected results.
> 
> I think you want to make sure you can do a context diff!  If the
> explanation is that there is something wrong with the your
> shell etc, then you probably don't care.
<snip>


OK, well, I narrowed the problem down to the fact that cvs is returning
255 when running the cvs diff command.  There doesn't seem to be any
obvious reason (even when I ran with -t), as the output seems to be
correct.  I built the same source version on redhat and ran the test and
compared the results, they seem to be identical:


**** Output From redhat linux (uname -a:Linux starbug.mqsoftware.com
2.4.20-20.8 #1 Mon Aug 18 14:59:07 EDT 2003 i686 i686 i386 GNU/Linux)
Index: sdir/ssdir/ssfile
===================================================================
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/sdir/ssdir/ssfile,v
retrieving revision 1.1
diff -c -r1.1 ssfile
*** sdir/ssdir/ssfile   6 Oct 2003 20:21:56 -0000       1.1
--- sdir/ssdir/ssfile   6 Oct 2003 20:21:57 -0000
***************
*** 1 ****
--- 1,2 ----
  ssfile
+ ssfile line 2
PASS: basica-6.2

**********************************
**** Output From NSK (uname -a:NONSTOP_KERNEL tiny G06 00 NSR-W)
Index: sdir/ssdir/ssfile
===================================================================
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/sdir/ssdir/ssfile,v
retrieving revision 1.1
diff -c -r1.1 ssfile
*** sdir/ssdir/ssfile   6 Oct 2003 20:30:31 -0000       1.1
--- sdir/ssdir/ssfile   6 Oct 2003 20:30:40 -0000
***************
*** 1 ****
--- 1,2 ----
  ssfile
+ ssfile line 2
/tmp/cvs-sanity/first-dir: echo $?
255
/tmp/cvs-sanity/first-dir:


At the end of the main() routine, err has a value of 1, so it's exiting
with a failure status.  Before I go digging (no debugger here, at least
not one that I have any skills with), does anyone have any great tips?
(like: "turn on the super-secret cvs magic-debug log file"????)


    /* This is exit rather than return because apparently that keeps
       some tools which check for memory leaks happier.  */
    exit (err ? EXIT_FAILURE : 0);
        /* Keep picky/stupid compilers (e.g. Visual C++ 5.0) happy.  */
        return 0;
}


Before I go too wrong, it's my understanding that cvs no longer uses an
external diff program, but that it has that code built into it.  This
belief is why I haven't attempted to replace the native diff (which
seems to work OK) with gnu diff or something.  If I'm wrong, that could
explain the problem.

Thanks,
        Kelly




reply via email to

[Prev in Thread] Current Thread [Next in Thread]