Re: Revert imported & modified files to "pristine" status

[Eric Siegerman]

On Thu, Jun 06, 2002 at 01:21:47AM +0100, Kenn Humborg wrote:
> 
> I've got an imported vendor branch, that I regularly update
> with new vendor releases.  Most files in the vendor's sources
> are unmodified by me, so an import followed by an update 
> conveniently pulls me up to the latest vendor versions.
> 
> Of course, for any files that I've modified (and thus exist
> on the trunk), I do an update -j VENDOR_V1 -j VENDOR_V2 followed
> by a commit to pull in changes.

Aside: 
If I'm reading this correctly, you're doing individual
        cvs update foo
or
        cvs update -jx -jy bar; cvs commit
commands for all the files, choosing the variant depending on
whether you've made local changes.  If so, yikes!  Why not let
CVS make that decision?  Just do the latter once for the whole
tree.

Now, on to your actual question...

> Is there any way to tell CVS that these files should track the
> vendor versions exactly, with no local changes?

cvs admin -b VENDOR foo

where "VENDOR" is the name of your vendor branch.

--

|  | /\
|-_|/  >   Eric Siegerman, Toronto, Ont.        address@hidden
|  |  /
Anyone who swims with the current will reach the big music steamship;
whoever swims against the current will perhaps reach the source.
        - Paul Schneider-Esleben