Greg A. Woods <[EMAIL PROTECTED]> wrote: > [ On Friday, September 28, 2001 at 16:34:19 (+0000), Gerhard Ahuis wrote: ] >> Subject: Howto solve this in cvs ? >> >> The vendor did a complete architecture change and cleanup between 2.x and 3.x. >> So I created a branch called MySoftBasedOn_2x on which further developments
> you don't really want a branch -- normal branches don't work well in > vendor branched modules. What is not working well ? I didn't have any problem until this problem arrises. > Your best approach is to start fresh with the 3.x release in a new module. That is not the way a version control system should work I think. If there is no way to do it with a vendor like import the only thing left is commiting the vendor changes as local changes on the MySoftBasedOn_2x branch. That will work but there is no easy way to distinguish vendor changes and local changes in that case (and I like the easy merging). There must be a better solution, cvs has not dissapointed me until now.. Cheers, Gerhard. -- Gerhard Ahuis [EMAIL PROTECTED] Unsolicited advertisements subject to $1000 consulting fee. _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
