13.09.07 Porting and Merging with subversion Common orders
svn co <Path> (checkout) svn help
Porting (from brunch to trunk) 1) 2) 3) 4) 5) 6) 7) 8) 9) 10)
svn update (on brunch and trunk) svn log --stop-on-copy (on trunk to check last ported revision) svn info (on branch to get current revision) mvn clean install (on brunch and trunk) diff -r <lastPortedRevision:currentRevision> history.txt (on brunch) svn merge -r <lastPortedRevision:currentRevision> -x --ignore-eol-style <PathOfBranch> (on trunk) svn merge -r 36151:36259 -x --ignore-eol-style $FLUX/branches/rb-5.3/ (solve conflicts) / svn status | grep ^C / svn resolve <filename> mvn clean install (on trunk) svn commit -m “ported from <branch>@<lastPortedRevision:currentRevision>” svn commit -m "ported from rb-5.3@36151:36259" svn log (check on trunk)
Porting (from trunk to branch) 1) 2) 3) 4) 5) 6) 7) 8) 9) 10)
svn update (on brunch and trunk) svn log --stop-on-copy (on branch to check last ported revision) svn info (on trunk to get current revision) mvn clean install (on brunch and trunk) diff -r <lastPortedRevision:currentRevision> history.txt (on trunk) svn merge -r <lastPortedRevision:currentRevision> -x --ignore-eol-style <PathOfTrunk> (on branch) svn merge -r 36151:36259 -x --ignore-eol-style $FLUX/trunk/ (solve conflicts) / svn status | grep ^C / svn resolve <filename> mvn clean install (on branch) svn commit -m “ported from <trunk>@<lastPortedRevision:currentRevision>” svn commit -m "ported from trunk@36151:36259" svn log (check on branch)
Create new branch a) b)
svn copy -r <revision> <PathFrom> <PathTo> -m “branched from trunk@<revision>” svn co <Path> svn copy . <Path> -m “branched from trunk@<revision>”
svn copy https://submav.clickandbuy.com/svn/jcnb3/kernel/branches/rb-6.5.3 https://submav.clickandbuy.com/svn/jcnb3/kernel/branches/fb-6.5.3-3718-SSA-CC -m "Branched from rb-6.5.3@65440."
kernel svn merge -r 68549:69224 https://submav.clickandbuy.com/svn/jcnb3/kernel/branches/rb-6.5.4 |tee ../merge-ker.txt svn commit -m "ported from rb-6.5.4@68549:69224" webapp svn merge -r 68549:69224 https://submav.clickandbuy.com/svn/jcnb3/webapp/branches/rb-6.5.4 |tee ../merge-web.txt
svn commit -m "ported from rb-6.5.4@68549:69224" config svn merge -r 68549:69224 https://submav.clickandbuy.com/svn/jcnb3/config/branches/rb-6.5.4-newdevel |tee ../merge-conf.txt
svn commit -m "ported from rb-6.5.4-newdevel@68549:69224"