60 static int merge_file PROTO ((struct file_info *finfo, Vers_TS *vers));
61 static int scratch_file PROTO((struct file_info *finfo, Vers_TS *vers));
591     Vers_TS *vers;  local
594 			    aflag, &vers, pipeout);
638 		retval = checkout_file (finfo, vers, 0, 0, 0);
664 		    retval = merge_file (finfo, vers);
673                     bakname = backup_file (finfo->file, vers->vn_user);
689                     retval = checkout_file (finfo, vers, 0, 0, 1);
693                     if (vers->ts_conflict)
706                             retcode = vers->ts_conflict[0] != '=';
710                             retcode = strcmp (vers->ts_conflict, filestamp);
715                         retcode = strcmp (vers->ts_conflict, filestamp);
735                                       vers->vn_rcs, vers->ts_rcs,
736                                       vers->options, vers->tag,
737                                       vers->date, (char *)0);
756 					 vers, &docheckout,
761 			    server_updated (finfo, vers,
776 		retval = checkout_file (finfo, vers, 0, 0, 1);
787 		retval = scratch_file (finfo, vers);
799 	join_file (finfo, vers);
802     if (ignlist && (status != T_UNKNOWN || vers->ts_user == NULL))
813     freevers_ts (&vers);
1239 scratch_file (finfo, vers)  in scratch_file()  argument
1241     Vers_TS *vers;
1248 	if (vers->ts_user == NULL)
1250 	server_updated (finfo, vers,
1268 	if (vers->vn_user != NULL)
1270 	    free (vers->vn_user);
1271 	    vers->vn_user = NULL;
1273 	if (vers->ts_user != NULL)
1275 	    free (vers->ts_user);
1276 	    vers->ts_user = NULL;
1969 merge_file (finfo, vers)  in merge_file()  argument
1971     Vers_TS *vers;
1986 		      + strlen (vers->vn_user)
1989     (void) sprintf (backup, "%s%s.%s", BAKPREFIX, finfo->file, vers->vn_user);
1996     if (strcmp (vers->options, "-kb") == 0
1998 	|| special_file_mismatch (finfo, NULL, vers->vn_rcs))
2021 	status = checkout_file (finfo, vers, 0, 1, 1);
2029 	       vers->vn_rcs, finfo->fullname);
2033 	history_write ('C', finfo->update_dir, vers->vn_rcs, finfo->file,
2039     status = RCS_merge(finfo->rcs, vers->srcfile->path, finfo->file,
2040 		       vers->options, vers->vn_user, vers->vn_rcs);
2044 	       "could not merge revision %s of %s", vers->vn_user, finfo->fullname);
2052     if (strcmp (vers->options, "-V4") == 0)
2053 	vers->options[0] = '\0';
2066 	Register (finfo->entries, finfo->file, vers->vn_rcs,
2067 		  "Result of merge", vers->options, vers->tag,
2068 		  vers->date, cp);
2076 	if (vers->vn_user != NULL)
2077 	    free (vers->vn_user);
2078 	vers->vn_user = xstrdup (vers->vn_rcs);
2089 	server_updated (finfo, vers, SERVER_MERGED,
2101 	cvs_output (vers->vn_user, 0);
2103 	cvs_output (vers->vn_rcs, 0);
2106 	history_write ('G', finfo->update_dir, vers->vn_rcs, finfo->file,
2118 	history_write ('C', finfo->update_dir, vers->vn_rcs, finfo->file, finfo->repository);
2129 	history_write ('G', finfo->update_dir, vers->vn_rcs, finfo->file,
2143 join_file (finfo, vers)  in join_file()  argument
2145     Vers_TS *vers;
2162 		vers->tag ? vers->tag : "",
2163 		vers->tag ? " (" : "",
2164 		vers->vn_rcs ? vers->vn_rcs : "",
2165 		vers->tag ? ")" : "",
2175     if (vers->srcfile == NULL ||
2176 	vers->srcfile->path == NULL)
2192     rev2 = RCS_getversion (vers->srcfile, jrev2, jdate2, 1, (int *) NULL);
2199 	rev1 = RCS_getversion (vers->srcfile, jrev1, jdate1, 1, (int *) NULL);
2204 	if (vers->vn_rcs == NULL)
2216 	    rev1 = gca (vers->vn_rcs, rev2);
2220     if (rev2 == NULL || RCS_isdead (vers->srcfile, rev2))
2230 	if (rev1 == NULL || RCS_isdead (vers->srcfile, rev1))
2269 	if (vers->vn_user == NULL
2270 	    || vers->vn_user[0] == '-'
2271 	    || RCS_isdead (vers->srcfile, vers->vn_user))
2283 	if (strcmp (vers->vn_user, "0") == 0
2284 	    || (vers->ts_user != NULL
2285 		&& strcmp (vers->ts_user, vers->ts_rcs) != 0))
2310 	    && strcmp (rev1, vers->vn_user) != 0)
2343 	mrev = xmalloc (strlen (vers->vn_user) + 2);
2344 	sprintf (mrev, "-%s", vers->vn_user);
2349 	    server_updated (finfo, vers, SERVER_UPDATED, (mode_t) -1,
2353 	Register (finfo->entries, finfo->file, mrev, vers->ts_rcs,
2354 		  vers->options, vers->tag, vers->date, vers->ts_conflict);
2374     if (vers->vn_user != NULL && strcmp (rev2, vers->vn_user) == 0)
2384     if (rev1 == NULL || RCS_isdead (vers->srcfile, rev1))
2393 	if (vers->vn_user == NULL)
2398 	    xvers = Version_TS (finfo, vers->options, jrev2, jdate2, 1, 0);
2443     if (vers->vn_user == NULL)
2467 	retcode = RCS_checkout (vers->srcfile, finfo->file,
2468 				vers->vn_user, (char *) NULL,
2485 		      + strlen (vers->vn_user)
2488     (void) sprintf (backup, "%s%s.%s", BAKPREFIX, finfo->file, vers->vn_user);
2496     t_options = vers->options;
2507     if (vers->vn_user != NULL
2508 	&& strcmp (rev1, vers->vn_user) == 0
2511 	&& vers->ts_user != NULL
2512 	&& strcmp (vers->ts_user, vers->ts_rcs) == 0
2586 	status = RCS_merge (finfo->rcs, vers->srcfile->path, finfo->file,
2619 		  vers->vn_rcs ? vers->vn_rcs : "0", "Result of merge",
2620 		  vers->options, vers->tag, vers->date, cp);
2630 	server_updated (finfo, vers, SERVER_MERGED,