===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/import.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -c -r1.72 -r1.73
*** src/usr.bin/cvs/import.c	2007/02/22 06:42:09	1.72
--- src/usr.bin/cvs/import.c	2007/06/01 17:47:47	1.73
***************
*** 1,4 ****
! /*	$OpenBSD: import.c,v 1.72 2007/02/22 06:42:09 otto Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   *
--- 1,4 ----
! /*	$OpenBSD: import.c,v 1.73 2007/06/01 17:47:47 niallo Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   *
***************
*** 338,344 ****
  
  	import_tag(cf, brev, newrev);
  
! 	if (cf->file_rcs->rf_branch == NULL || cf->file_rcs->rf_inattic == 1 ||
  	    strcmp(branch, import_branch)) {
  		import_conflicts++;
  		cvs_printf("C %s/%s\n", import_repository, cf->file_path);
--- 338,344 ----
  
  	import_tag(cf, brev, newrev);
  
! 	if (cf->file_rcs->rf_branch == NULL || cf->in_attic == 1 ||
  	    strcmp(branch, import_branch)) {
  		import_conflicts++;
  		cvs_printf("C %s/%s\n", import_repository, cf->file_path);