===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/watch.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -c -r1.22 -r1.23
*** src/usr.bin/cvs/watch.c	2011/12/27 13:59:01	1.22
--- src/usr.bin/cvs/watch.c	2017/06/01 08:08:24	1.23
***************
*** 1,4 ****
! /*	$OpenBSD: watch.c,v 1.22 2011/12/27 13:59:01 nicm Exp $	*/
  /*
   * Copyright (c) 2005-2007 Xavier Santolaria <xsa@openbsd.org>
   *
--- 1,4 ----
! /*	$OpenBSD: watch.c,v 1.23 2017/06/01 08:08:24 joris Exp $	*/
  /*
   * Copyright (c) 2005-2007 Xavier Santolaria <xsa@openbsd.org>
   *
***************
*** 119,125 ****
  	cr.enterdir = NULL;
  	cr.leavedir = NULL;
  
! 	if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) {
  		cvs_client_connect_to_server();
  		cr.fileproc = cvs_client_sendfile;
  
--- 119,125 ----
  	cr.enterdir = NULL;
  	cr.leavedir = NULL;
  
! 	if (cvsroot_is_remote()) {
  		cvs_client_connect_to_server();
  		cr.fileproc = cvs_client_sendfile;
  
***************
*** 147,153 ****
  
  	cvs_file_run(argc, argv, &cr);
  
! 	if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) {
  		cvs_client_send_files(argv, argc);
  		cvs_client_senddir(".");
  
--- 147,153 ----
  
  	cvs_file_run(argc, argv, &cr);
  
! 	if (cvsroot_is_remote()) {
  		cvs_client_send_files(argv, argc);
  		cvs_client_senddir(".");
  
***************
*** 195,201 ****
  	cr.enterdir = NULL;
  	cr.leavedir = NULL;
  
! 	if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) {
  		cvs_client_connect_to_server();
  		cr.fileproc = cvs_client_sendfile;
  
--- 195,201 ----
  	cr.enterdir = NULL;
  	cr.leavedir = NULL;
  
! 	if (cvsroot_is_remote()) {
  		cvs_client_connect_to_server();
  		cr.fileproc = cvs_client_sendfile;
  
***************
*** 209,215 ****
  
  	cvs_file_run(argc, argv, &cr);
  
! 	if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) {
  		cvs_client_send_files(argv, argc);
  		cvs_client_senddir(".");
  		cvs_client_send_request("watchers");
--- 209,215 ----
  
  	cvs_file_run(argc, argv, &cr);
  
! 	if (cvsroot_is_remote()) {
  		cvs_client_send_files(argv, argc);
  		cvs_client_senddir(".");
  		cvs_client_send_request("watchers");