[Top][All Lists]

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

Vendor branches and head revisions

From: Jouni Heikniemi
Subject: Vendor branches and head revisions
Date: Fri, 17 May 2002 14:33:34 +0300 (EEST)

I've tried browsing the list archive, but couldn't find a comprehensive
answer on this neither in the archives nor the documents. So I'll just 

We have the normal scenario with a software vendor providing updated
sources every now and then and lots of hacking going on between the vendor
releases. Now the problem with cvs import is that it marks locally
unmodified files as the trunk's head revision, possibly causing trunk to
be in uncompilable state until the branch is merged completely. This is
not acceptable, as merges can take days or even weeks.

I'll list out what I have figured from the various sources. I'd greatly
appreciate corrections and proposals for better approaches.

- The best way around the mentioned problem is to use normal branches
- Import doesn't work properly on non-vendor branches
- 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.
- After this, merges could be done like with any other branches.

Is this actually doable, and what problems am I to expect? 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?

Any advice is appreciated. 


reply via email to

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