dist/src/update.c

2074     char *rev2;
2115     rev2 = RCS_getversion (vers->srcfile, jrev2, jdate2, 1, NULL);
2129 	else if (rev2 == NULL)
2133                branch: that case is represented by a dead rev2.  If
2139 	    rev1 = gca (vers->vn_rcs, rev2);
2143     if (rev2 == NULL || RCS_isdead (vers->srcfile, rev2))
2147 	if (rev2 != NULL)
2148 	    free (rev2);
2295      * to do.  This needs to be checked before the rev2 == up-to-date base
2296      * revision check tha comes next.  Otherwise, rev1 can == rev2 and get an
2299     if (rev1 && strcmp (rev1, rev2) == 0)
2302 	free (rev2);
2307      * optimization to skip the merge when rev2 is the same as the base
2313         && strcmp (rev2, vers->vn_user) == 0)
2321 	    cvs_output (rev2, 0);
2327 	free (rev2);
2333        between rev1 and rev2.  */
2338 	free (rev2);
2387 	free (rev2);
2462 	 * -kk mode before computing the diff between rev1 and rev2 - I'm not
2466 	 * Therfore, checking out the destination revision (rev2) is probably
2469 	 * and not the keywords from rev2.
2474 	if (RCS_checkout (finfo->rcs, finfo->file, rev2, NULL, t_options,
2491 	   what is really going on (it gives them rev1 and rev2 but doesn't
2500 	     || special_file_mismatch (finfo, rev1, rev2))
2509 	if (RCS_checkout (finfo->rcs, finfo->file, rev2, NULL,
2534 	       rev2, finfo->fullname);
2540 			    t_options, rev1, rev2);
2547 		   "could not merge revision %s of %s", rev2, finfo->fullname);
2565 		cvs_output (rev2, 0);
2590     free (rev2);
2610 special_file_mismatch (struct file_info *finfo, char *rev1, char *rev2)
2727     if (rev2 == NULL)
2753 	n = findnode (finfo->rcs->versions, rev2);
2789 			   finfo->file, rev2, (char *)n->data);
2797 			   finfo->file, rev2, ftype);
2823 	       (rev2 == NULL ? "working file" : rev2));
2836 		   (rev2 == NULL ? "working file" : rev2));
2846 		   (rev2 == NULL ? "working file" : rev2));
2857 		   (rev2 == NULL ? "working file" : rev2));
2867 		   (rev2 == NULL ? "working file" : rev2));
2877 		       (rev2 == NULL ? "working file" : rev2));
2888 		   (rev2 == NULL ? "working file" : rev2));