[Top][All Lists]

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

Re: importing vendor branches

From: Laine Stump
Subject: Re: importing vendor branches
Date: 04 May 2001 12:22:16 -0400
User-agent: Gnus/5.0808 (Gnus v5.8.8) Emacs/20.7

"David L. Martin" <address@hidden> writes:

> When a new RCS file is created as a result of cvs import, the
> RCS archive's default branch is 1.1.1.  When/If the first local modification
> is committed, the default branch becomes blank (= the trunk).  See the
> output of cvs log in the "Branch:" field.  The tip of the default branch
> appears to be what is regarded by CVS as the revision to retrive
> in an update -A.
> To make update -A retrieve the trunk revision (1.1) for locally
> unmodified files which have been imported, you could use cvs admin -b
> on all files created by the import to force the default branch to be empty
> (i.e. the trunk).
> To avoid this mess, you might consider moving your development
> from the trunk to a branch.  You'd be guaranteed that a vendor
> import would not affect the contents of your development branch,
> until you decide to merge the vendor branch deltas yourself using
> standard merge procedures.

Another way to "fix" this is to just force a "null commit" (new
revision, but 0 lines changed) on the trunk of each new file right
after it is initially imported. Once you've done this, a checkout on
the trunk will give only things that have been explicitly committed to
the trunk, never anything directly from the vendor branch. The next
time you do an import, the changes will be only on the vendor branch
until you do a merge to the trunk (which should be painless for the
locally-unmodified files, since there won't be any conflicts). This
*will* mean that each change on the vendor branch will result in a new
rev on the trunk, which may or may not displease you.

(sorry if this method was already brought up - I got into the
conversation late, and had already deleted all the old posts)

reply via email to

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