===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/import.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -c -r1.78 -r1.79
*** src/usr.bin/cvs/import.c	2008/01/10 09:37:26	1.78
--- src/usr.bin/cvs/import.c	2008/01/10 09:54:04	1.79
***************
*** 1,4 ****
! /*	$OpenBSD: import.c,v 1.78 2008/01/10 09:37:26 tobias Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   *
--- 1,4 ----
! /*	$OpenBSD: import.c,v 1.79 2008/01/10 09:54:04 tobias Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   *
***************
*** 300,306 ****
  		fatal("import_update: rcsnum_parse failed");
  
  	if (rev != NULL) {
! 		if ((b1 = rcs_rev_getbuf(cf->file_rcs, rev, 0)) == NULL)
  			fatal("import_update: failed to grab revision");
  
  		if ((b2 = cvs_buf_load_fd(cf->fd, BUF_AUTOEXT)) == NULL)
--- 300,307 ----
  		fatal("import_update: rcsnum_parse failed");
  
  	if (rev != NULL) {
! 		if ((b1 = rcs_rev_getbuf(cf->file_rcs, rev, RCS_KWEXP_NONE))
! 		    == NULL)
  			fatal("import_update: failed to grab revision");
  
  		if ((b2 = cvs_buf_load_fd(cf->fd, BUF_AUTOEXT)) == NULL)
***************
*** 389,395 ****
  		cvs_buf_free(b1);
  
  		(void)xasprintf(&p2, "%s/diff2.XXXXXXXXXX", cvs_tmpdir);
! 		rcs_rev_write_stmp(cf->file_rcs, rev, p2, 0);
  
  		diff_format = D_RCSDIFF;
  		if (cvs_diffreg(p2, p1, b2) == D_ERROR)
--- 390,396 ----
  		cvs_buf_free(b1);
  
  		(void)xasprintf(&p2, "%s/diff2.XXXXXXXXXX", cvs_tmpdir);
! 		rcs_rev_write_stmp(cf->file_rcs, rev, p2, RCS_KWEXP_NONE);
  
  		diff_format = D_RCSDIFF;
  		if (cvs_diffreg(p2, p1, b2) == D_ERROR)