[Top][All Lists]

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

Re: cvs import showed up on trunk for modified file??

From: Larry Jones
Subject: Re: cvs import showed up on trunk for modified file??
Date: Mon, 8 Apr 2002 16:35:00 -0400 (EDT)

JSo writes:
> I created a vendor branch yesterday, and I did a cvs import on the same
> vendor branch the second time with some changes (new and modified files).  I
> was expecting to see the changes on the vendor branch only.   To
> my surprise, when I checked out from the trunk, I got the latest change.  Is
> that normal please?

Yes, it is.

> Then I thought... oh... maybe cvs will populate the trunk "secretly and"
> automatically if
> 1) the imported file is a brand new file
> 2) the HEAD has the same content as the revision before the import

Almost.  If you have never made any local changes to a file (which is
trivially true for a brand new file), or if you have "reverted to the
vendor branch" (see the manual), then newly imported versions of the
file are implicitly on the trunk, too.

-Larry Jones

Let's pretend I already feel terrible about it, and that you
don't need to rub it in any more. -- Calvin

reply via email to

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