info-cvs
[Top][All Lists]
Advanced

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

RE: Import question


From: Lemke, Michael IZ/HZA-IOP
Subject: RE: Import question
Date: Thu, 22 Jul 2004 17:51:25 +0200

> From: Mark D. Baushke
> Sent: Thursday, July 22, 2004 5:16 PM
> To: Lemke, Michael IZ/HZA-IOP
> Cc: 'address@hidden'
> Subject: Re: Import question 
> 
> 
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Lemke, Michael  IZ/HZA-IOP writes:
> 
> > When I do a cvs import of a new vendor version the new 
> files become the
> > head revision.  I'd like to do the import such that it 
> doesn't affect HEAD.
> > Only after I've tested the new stuff I want it to become 
> HEAD.  Of course,
> > it should work with local changes merged in just like the 
> standard way of
> > doing it on the trunk.  How can I do this?  
> 
> A feature to deal with this was just added to the CVS feature branch
> based on patches from "Chris G. Demetriou". It is the 'cvs import -X'
> switch which may be enabled by default using the option
> "ImportNewFilesToVendorBranchOnly=yes" in the CVSROOT/config file.
> If you checkout the top-of-tree cvs.cvshome.org ccvs module, you can
> have a version of CVS with this feature.

Hey, cool.  Why wasn't that there in the first place? ;-)  But I'll
probably not grab it now but wait until it appears in the next 1.12.X
release.

However, this whole thing makes me realize I don't really understand
vendor branches.  What's different from ordinary ones?  Just that the
trunk helps itself to grab a version from it if it doesn't have one yet?
The Cederqvist seems a bit short on it but maybe I should study it again.
And what's that default branch stuff?

> 
> However, Chris also provided a proof of concept set of shell 
> scripts to
> help you in the short term.
> 

Thanks, but that's a bit too hot for me messing with the repository
files directly.


Anyway, thanks y'all for the quick help.  Glad I asked.

Michael




reply via email to

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