If I change a file in my working copy of the cvs tree, is there a way to
discard my changes and re-sync with the main tree, short of removing the
files I have changed, or making a diff and patching with -R?

-- 
Bruce Momjian                          |  830 Blythe Avenue
maillist@candle.pha.pa.us              |  Drexel Hill, Pennsylvania 19026
  +  If your life is a hard drive,     |  (610) 353-9879(w)
  +  Christ can be your backup.        |  (610) 853-3000(h)

Mon, 4 May 1998 00:03:07 -0400 (EDT)
Bruce Momjian <maillist@candle.pha.pa.us>
cvs question
On Mon, 4 May 1998, Bruce Momjian wrote:

> If I change a file in my working copy of the cvs tree, is there a way to
> discard my changes and re-sync with the main tree, short of removing the
> files I have changed, or making a diff and patching with -R?

	Not that I am personally aware of...



Mon, 4 May 1998 11:37:00 -0400 (EDT)
The Hermit Hacker <scrappy@hub.org>
Re: [HACKERS] cvs question
> 
> On Mon, 4 May 1998, Bruce Momjian wrote:
> 
> > If I change a file in my working copy of the cvs tree, is there a way to
> > discard my changes and re-sync with the main tree, short of removing the
> > files I have changed, or making a diff and patching with -R?
> 
> 	Not that I am personally aware of...
> 
> 
> 

I have written a script to do an 'cvs -q -n update pgsql', get the file
names beginning with 'M', remove those files, and then do a normal
update.

Seems very strange, but it works.  Still looking for a better way.

-- 
Bruce Momjian                          |  830 Blythe Avenue
maillist@candle.pha.pa.us              |  Drexel Hill, Pennsylvania 19026
  +  If your life is a hard drive,     |  (610) 353-9879(w)
  +  Christ can be your backup.        |  (610) 853-3000(h)

Mon, 4 May 1998 11:42:05 -0400 (EDT)
Bruce Momjian <maillist@candle.pha.pa.us>
Re: [HACKERS] cvs question
-----BEGIN PGP SIGNED MESSAGE-----

Then <maillist@candle.pha.pa.us> spoke up and said:
> I have written a script to do an 'cvs -q -n update pgsql', get the file
> names beginning with 'M', remove those files, and then do a normal
> update.

That's better than the "cannonical" method: cvs co pgsql
- -- 
=====================================================================
| JAVA must have been developed in the wilds of West Virginia.      |
| After all, why else would it support only single inheritance??    |
=====================================================================
| Finger geek@andrew.cmu.edu for my public key.                     |
=====================================================================

-----BEGIN PGP SIGNATURE-----
Version: 2.6.2

iQBVAwUBNU3jYIdzVnzma+gdAQGwggIAl6XEJ8F32P9ND09ZTLJrk3a4JAnAFmX6
esjzA5COPucpDCcmMKQdU0p5bslUv1PLiWaaLJi0PzqCz41YojG+Qw==
=KS1P
-----END PGP SIGNATURE-----


4 May 1998 11:48:49 -0400
<geek+@cmu.edu>
Re: [HACKERS] cvs question