[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Files missed during "cvs import"

From: Greg A. Woods
Subject: Re: Files missed during "cvs import"
Date: Wed, 5 Mar 2003 18:43:32 -0500 (EST)

[ On Wednesday, March 5, 2003 at 14:53:50 (-0800), Steve Madsen wrote: ]
> Subject: Files missed during "cvs import"
> I have a project that started life as a vendor source snapshot.
> Unfortunately, one directory of files was missed during the initial import
> and later added via "cvs commit".
> Subsequent imports of vendor snapshots are not importing newer versions
> of these files.

Those added files don't have a vendor branch and thus look to "cvs
import" as if they are locally added files (which in fact they are :-).

>  How can I tell CVS to put the latest versions of these files
> on the vendor branch and not treat them as locally modified files?

You should probably re-build that directory by cleaning it out and
starting over.  Save the existing ,v files and use those to re-construct
the local changes (i.e. you will extract and apply the diffs to each
file for each local change re-commit after every iteration, using the
original log message).

> If possible, I would like to do this without re-importing the latest vendor
> snapshot again.

You only have to re-import that one directory, though you should
separately "cvs import" all the vendor releases of that one directory,
interleaving each with any re-commits of the local changes (assuming
there was more than one import done prior to trying to import this
latest vendor release).

You could automate the process with a well planned script, but if there
are only a few local changes to the "missing" files then it's probably a
lot faster and just as reliable to just to it all by hand and be done
with it.

It would be safest to make sure there are no active working directories
anywhere for this module for the duration of this fix-up work.  I.e. get
everyone to commit or store privately any pending changes and to release
all their working directories for this module and especially for the
directory in question.

                                                                Greg A. Woods

+1 416 218-0098;            <address@hidden>;           <address@hidden>
Planix, Inc. <address@hidden>; VE3TCP; Secrets of the Weird <address@hidden>

reply via email to

[Prev in Thread] Current Thread [Next in Thread]