This is an old revision of the document!

====== Release cycle with subversion ====== Quick recipe/self-reminder of how I handle branching/merging on releases. Premises: * Trunk contains last release * All development goes in branches * Upon release, branch gets merged to trunk and then removed * Each release has a corresponding tag * Tags are never modified FIXME: Backporting still untested Example: Working on branch 1.1 of ''foo'' (''[x]$'' marks directory from which to run –''wcopy'' for working copy–, for ''$'' directory doesn't matter) [wcopy]$ svn update [wcopy]$ svn ci -m "* Last commit before merging" $ svn co url://TRUNK [trunk]$ svn merge --reintegrate url://BRANCHES/1-1 . # --reintegrate vital here (except if re-merging)! Note the final dot! [trunk]$ svn ci -m "* Merge branch 1.1 to trunk" $ svn copy url://TRUNK url://TAGS/1.1 $ svn rm url://BRANCHES/1.1 $ svn copy url://TAGS/1.1 url://BRANCHES/1.2 # or 1.1.1 [wcopy]$ svn switch url://BRANCHES/1.2 Release: $ svn export url://TAGS/1.1 [1.1]$ # package etc. ===== Merge from parallel branches ===== ''svn merge'' acts as a normal diff. \\ ''svn merge -r R1:R2'' acts as a three-way diff. Ref: http://svnbook.red-bean.com/en/1.0/ch04s04.html $ svn log --verbose --stop-on-copy # Identify branching revision, e.g. 1600 [wcopy]$ svn update # Identify HEAD, e.g. 1700 [wcopy]$ svn merge -r1600:HEAD url://SOURCE_BRANCH . # Fix conflicts. Only *actual* conflicts should be shown, normal changes should integrate correctly [wcopy]$ svn ci -m "* Merge from branch X, r1600:1700" # Log revisions for later merges (check with 'svn log') Later merges should be restricted to the non-merged revisions: [wcopy]$ svn merge -r 1701:HEAD url://SOURCE_BRANCH .