===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/annotate.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -c -r1.68 -r1.69
*** src/usr.bin/cvs/annotate.c	2017/05/31 16:14:37	1.68
--- src/usr.bin/cvs/annotate.c	2017/06/01 08:08:24	1.69
***************
*** 1,4 ****
! /*	$OpenBSD: annotate.c,v 1.68 2017/05/31 16:14:37 joris Exp $	*/
  /*
   * Copyright (c) 2007 Tobias Stoeckmann <tobias@openbsd.org>
   * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: annotate.c,v 1.69 2017/06/01 08:08:24 joris Exp $	*/
  /*
   * Copyright (c) 2007 Tobias Stoeckmann <tobias@openbsd.org>
   * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org>
***************
*** 104,110 ****
  	cr.enterdir = NULL;
  	cr.leavedir = NULL;
  
! 	if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) {
  		cvs_client_connect_to_server();
  		cr.fileproc = cvs_client_sendfile;
  
--- 104,110 ----
  	cr.enterdir = NULL;
  	cr.leavedir = NULL;
  
! 	if (cvsroot_is_remote()) {
  		cvs_client_connect_to_server();
  		cr.fileproc = cvs_client_sendfile;
  
***************
*** 130,144 ****
  
  	cr.flags = flags;
  
! 	if (cvs_cmdop == CVS_OP_ANNOTATE ||
! 	    current_cvsroot->cr_method == CVS_METHOD_LOCAL) {
  		if (argc > 0)
  			cvs_file_run(argc, argv, &cr);
  		else
  			cvs_file_run(1, &arg, &cr);
  	}
  
! 	if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) {
  		cvs_client_send_files(argv, argc);
  		cvs_client_senddir(".");
  
--- 130,143 ----
  
  	cr.flags = flags;
  
! 	if (cvs_cmdop == CVS_OP_ANNOTATE || cvsroot_is_local()) {
  		if (argc > 0)
  			cvs_file_run(argc, argv, &cr);
  		else
  			cvs_file_run(1, &arg, &cr);
  	}
  
! 	if (cvsroot_is_remote()) {
  		cvs_client_send_files(argv, argc);
  		cvs_client_senddir(".");