Re: Import question

[Pierre Asselin]

Lemke, Michael  IZ/HZA-IOP <address@hidden> wrote:
> 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?  

There is no way to avoid that.  Your trunk is broken between the time
you do the import and when you merge the import back to the trunk.

To mitigate the problem, you should tag your trunk before you do the
import.  If the post-import merge gives you trouble, you can at least
start a branch off your pre-import tag so you can continue your work
in another sandbox while you sort things out.  When you finally merge
the import, you go on to merge the temporary branch.

-- 
pa at panix dot com