[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Vendor branches and head revisions
From: |
Eric Siegerman |
Subject: |
Re: Vendor branches and head revisions |
Date: |
Fri, 17 May 2002 13:14:38 -0400 |
User-agent: |
Mutt/1.2.5i |
On Fri, May 17, 2002 at 11:52:39AM -0400, Greg A. Woods wrote:
> [ On Friday, May 17, 2002 at 14:33:34 (+0300), Jouni Heikniemi wrote: ]
> > - Therefore the updates should be done by checking out a fresh sandbox
> > from the "vendor" branch (really a normal one), copying the
> > modified files over the old stuff and then committing.
> > [...]
> > At least I know
> > I'll have to cvs add and rm files by hand before the import-commit;
> > [...]
> > is
> > there a good way of doing this automatically?
>
> Removed files can be a little harder to spot.
>
> In times I've done this before I've just done a simple "diff" of the
> sorted file listings from the relevant releases of the vendor's source
> archive.
Or delete them all in advance:
- Check out the fresh sandbox mentioned above, from the
pseudo-vendor branch
- Delete everything that isn't a CVS admin file. Something
like this (but test thoroughly of course):
find <sandbox> ! -type d -print | grep -v '/CVS/[^/]*$' | xargs rm
- Unpack the new distribution into your now-empty sandbox. At
this point, you have a sandbox containing precisely the new
vendor distribution, but with all of its CVS state
corresponding to the previous distribution.
- Type "cvs -nq update". Be *sure* to use "-n", or you'll
clobber half the info you're trying to capture.
- "cvs add" any files that show up as "?"
- "cvs rm" any files that are complained about as being "lost"
--
| | /\
|-_|/ > 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