Loading...
 

UsingLibrariesInCVS

merge to branch


All the above being done on HEAD, it can be convenient to cascade the upgrade on branches. Usual tiki merges occur usually from branch to HEAD, now it's the contrary for such third party libs.

Copy to clipboard
$ cvs co -r BRANCH-1-9 _adodb $ cd _adodb $ cvs up -jHEAD


Then fix conflicts and commit

Copy to clipboard
$ grep -r '<<<<<<<' * # .. hack and fix $ cvs ci -m'applied tiki former changes to adodb 3.70'



Created by: Last Modification: Wednesday 09 May 2007 20:35:38 UTC by sylvie greverend
List Slides
Export PDF
Handouts
Exit Slideshow