[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: rolling back and importing
From: |
Todd Denniston |
Subject: |
Re: rolling back and importing |
Date: |
Wed, 16 Mar 2005 16:42:31 -0500 |
Justin wrote:
>
> Hi,
>
<SNIP>
> 2. I have two versions of our source code I want to import into cvs. I
> would like to import the first version, then tag it and import the
> second. But I don't want to tag the second because it's not ready yet.
> How can I import the new code into the same trunk as the tagged version?
> Import the second as a different tag, then delete that tag? After all,
> Import will sync with the trunk, as well as create the tag right?
three choices:
1) use `cvs import` with a tag you don't care about for the second one,
i.e.,
`cvs import repository vendor-tag I_HadToPutItHereButDontCare1_release-tag`
2) use normal methods, i.e., for the second one checkout from the repo and
copy the changed files on top of the sand box and commit (do any add/removes
as needed). Note that this will get you a bunch of conflicts on the trunk if
you ever use import again.
3) always use normal methods, i.e., from the start do all the cvs
add/remove/tag/commits by hand.
--
Todd Denniston
Crane Division, Naval Surface Warfare Center (NSWC Crane)
Harnessing the Power of Technology for the Warfighter