===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/update.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -c -r1.67 -r1.68
*** src/usr.bin/cvs/update.c	2006/05/28 17:25:18	1.67
--- src/usr.bin/cvs/update.c	2006/05/30 21:32:52	1.68
***************
*** 1,4 ****
! /*	$OpenBSD: update.c,v 1.67 2006/05/28 17:25:18 joris Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   *
--- 1,4 ----
! /*	$OpenBSD: update.c,v 1.68 2006/05/30 21:32:52 joris Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   *
***************
*** 113,119 ****
  
  	cvs_log(LP_TRACE, "cvs_update_enterdir(%s)", cf->file_path);
  
! 	cvs_file_classify(cf, 0);
  
  	if (cf->file_status == DIR_CREATE && build_dirs == 1) {
  		cvs_mkpath(cf->file_path);
--- 113,119 ----
  
  	cvs_log(LP_TRACE, "cvs_update_enterdir(%s)", cf->file_path);
  
! 	cvs_file_classify(cf, NULL, 0);
  
  	if (cf->file_status == DIR_CREATE && build_dirs == 1) {
  		cvs_mkpath(cf->file_path);
***************
*** 241,247 ****
  	 * which is called from cvs_checkout_file().
  	 */
  	bp = NULL;
! 	cvs_file_classify(cf, 1);
  
  	switch (cf->file_status) {
  	case FILE_UNKNOWN:
--- 241,247 ----
  	 * which is called from cvs_checkout_file().
  	 */
  	bp = NULL;
! 	cvs_file_classify(cf, NULL, 1);
  
  	switch (cf->file_status) {
  	case FILE_UNKNOWN:
***************
*** 269,288 ****
  	case FILE_LOST:
  	case FILE_CHECKOUT:
  	case FILE_PATCH:
! 		bp = rcs_getrev(cf->file_rcs, cf->file_rcs->rf_head);
  		if (bp == NULL)
  			fatal("cvs_update_local: failed to get HEAD");
  
! 		cvs_checkout_file(cf, cf->file_rcs->rf_head, bp, 0);
  		cvs_printf("U %s\n", cf->file_path);
  		break;
  	case FILE_MERGE:
  		bp = cvs_diff3(cf->file_rcs, cf->file_path,
! 		    cf->file_ent->ce_rev, cf->file_rcs->rf_head, 1);
  		if (bp == NULL)
  			fatal("cvs_update_local: failed to merge");
  
! 		cvs_checkout_file(cf, cf->file_rcs->rf_head, bp, CO_MERGE);
  
  		if (diff3_conflicts != 0) {
  			cvs_printf("C %s\n", cf->file_path);
--- 269,288 ----
  	case FILE_LOST:
  	case FILE_CHECKOUT:
  	case FILE_PATCH:
! 		bp = rcs_getrev(cf->file_rcs, cf->file_rcsrev);
  		if (bp == NULL)
  			fatal("cvs_update_local: failed to get HEAD");
  
! 		cvs_checkout_file(cf, cf->file_rcsrev, bp, 0);
  		cvs_printf("U %s\n", cf->file_path);
  		break;
  	case FILE_MERGE:
  		bp = cvs_diff3(cf->file_rcs, cf->file_path,
! 		    cf->file_ent->ce_rev, cf->file_rcsrev, 1);
  		if (bp == NULL)
  			fatal("cvs_update_local: failed to merge");
  
! 		cvs_checkout_file(cf, cf->file_rcsrev, bp, CO_MERGE);
  
  		if (diff3_conflicts != 0) {
  			cvs_printf("C %s\n", cf->file_path);