Re: Seg fault in 1.12.5

[Steve McIntyre]

On Sun, Feb 22, 2004 at 01:44:49AM +0000, Steve McIntyre wrote:
>
>Looks like I've maybe found it - it's simply the check around the new
>optimisations in join_file():
>
>+    /* If we know that the user file is up-to-date, then it becomes an
>+     * optimization to skip the merge when rev2 is the same as the base
>+     * revision.  i.e. we know that diff3(file2,file1,file2) will produce
>+     * file2. Note: If rev1 did not exist in the file (rev1 == NULL),
>+     * be silent.
>+     */
>+    if (vers->ts_user
>+        && strcmp (vers->ts_user, vers->ts_rcs) == 0
>+        && strcmp (rev2, vers->vn_user) == 0)
>+    {
>+       if (!really_quiet && rev1 != NULL)
>+       {
>+           cvs_output (finfo->fullname, 0);
>+           cvs_output (" already contains the differences between ", 0);
>+           cvs_output (rev1, 0);
>+           cvs_output (" and ", 0);
>+           cvs_output (rev2, 0);
>+           cvs_output ("\n", 1);
>+       }
>+
>
>Simply replacing the outer check with the old (1.12.1) code:
>
>if (vers->vn_user != NULL && strcmp (rev2, vers->vn_user) == 0)
>
>_seems_ to work, but I don't pretend to be able to follow this code at
>1.30AM. Hopefully I've helped point somebody to the right area of the
>code here...

Is anybody else reading this? Hello... llo... o...???

-- 
Steve McIntyre, Cambridge, UK.                                steve@einval.com
  Getting a SCSI chain working is perfectly simple if you remember that there
  must be exactly three terminations: one on one end of the cable, one on the
  far end, and the goat, terminated over the SCSI chain with a silver-handled
  knife whilst burning *black* candles. --- Anthony DeBoer