[cvsnt] Re: vendor branch and import problem

[Tony Hoyle]

On Thu, 26 Feb 2004 17:38:52 +0100, Oliver Giesen <ogware at gmx.net>
wrote:


> > An import will
>> allow you to update your sources
>
>It no longer does... :(
>
If course it does...  import still works fine.

>Yes, it's a matter of merging back and forth. Hasn't been much of an 
>effort so far. However, my case is probably a bit special in this 
>respect as the local modifications I make eventually get contributed to 
>the "official" third-party sources anyway. All I usually have to do when 
>we get the next third-party release is use cvs admin -b to reset the 
>default branch to the vendor branch...

If there are a lot of changes it rapidly becomes impractical, plus you
lose all the history.  A proper baseline would allow you to change the
sources your changes were based on without losing any history up to
that point.  

Tony