[SVN] Tag / Branch / Merge

= svn tag

Release 한 시점을 포인팅할 때 사용

= svn branch

= svn merge

trunk 나 다른 branch 에서 branch하는 방법과 

모든 Branch의 작업이 끝나고 trunk와 Merge시

참고 사이트> 아래 싸이트 잘 설명 되어 있음. 강추

SVN branch and merge 쉽게 활용하기 #2

SVN 사용시에 branch와 merge 잘 이용하기

. 범례

[TRUNK] : Trunk SVN Path

[BRANCH] : Branch SVN Path

[TAG] : Tag SVN Path

<Branch Dir> : Branch Check out Directory

<Trunk Dir> : Trunk Check out Directory

. Tag 생성

svn copy [TRUNK] [TAG]/_Version_ -m "Comment"

. 적용 예>

svn copy svn://192.168.88.210/SAW_APC/trunk/C-2000X svn://192.168.88.210/SAW_APC/tags/3.2.1 -m "Release 3.2.1/2"

. Branch 생성

svn copy [TRUNK] [BRANCH]  <== Branch Repository 생성

svn co [BRANCH] <Branch Dir> 

. Trunk 변경 내용 Branch 적용

<실행위치 : Branch의 맨 상위 디렉토리>

cd <Branch Dir>

svn merge [TRUNK] --dry-run   

--dry-run : 이 옵션은 적용하지 않고 결과만 미리 판단하기 위해서 사용함.

svn merge [TRUNK] <== 실제 적용

svn ci -m "Merging Branch with Trunk"   <== SVN 반영(변경 내용 있으면)

. Branch 변경 내용 Trunk 적용

<실행위치 : 위치 상관없음>

svn co [TRUNK] <Trunk Dir>

svn merge [TRUNK] [BRANCH] <Trunk Dir> --dry-run   <== 연습

svn merge [TRUNK] [BRANCH] <Trunk Dir>   <== 실전

cd <Trunk Dir>

svn ci -m "Merging Branch into Trunk"   <== SVN 반영(변경 내용 있으면)

. 적용 예>

svn co svn://192.168.88.210/ipq8064/branches/ilq6.0-APC_AUTH Branch

svn co svn://192.168.88.210/ipq8064/branches/ilq6.0-APC Trunk

cd Branch

svn merge svn://192.168.88.210/ipq8064/branches/ilq6.0-APC --dry-run 

# for   Tree conflicts: 19

svn resolve --accept working -R 

  qsdk/qca/feeds/luci/modules/luci-base/luasrc/view/cbi 

qsdk/qca/feeds/luci/modules/luci-mod-admin-full/luasrc  

qsdk/qca/feeds/luci/themes/luci-theme-openwrt/htdocs/luci-static

qsdk/package/network/utils

qsdk/package/base-files/files/etc

qsdk/package/base-files/files/sbin

svn merge svn://192.168.88.210/ipq8064/branches/ilq6.0-APC

[/home/firstpw/IPQ/Branch] svn merge --dry-run svn://192.168.88.210/ipq8064/trunk/ilq6.0

......................

   C qsdk/qca/feeds/luci/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/apc.lua

   C qsdk/qca/feeds/luci/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/radius.lua

C    qsdk/qca/feeds/luci/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua

   C qsdk/qca/feeds/luci/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/ftp.lua

   C qsdk/qca/feeds/luci/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/alarm.lua

C    qsdk/qca/feeds/luci/modules/luci-base/luasrc/model/network.lua

   C qsdk/qca/feeds/luci/modules/luci-base/luasrc/view/cbi/cpxtblsectionswitch.htm

   C qsdk/qca/feeds/luci/modules/luci-base/luasrc/view/cbi/value_wips.htm

C    qsdk/qca/feeds/qca/net/qca-hostap/files/hostapd-default.config

C    qsdk/qca/feeds/qca/net/qca-hostap/files/hostapd.sh

.................................

A    qsdk/package/mp_utils/src/bd_param.h

A    qsdk/package/mp_utils/src/mputl_ser.c

A    qsdk/package/mp_utils/src/Makefile

A    qsdk/package/mp_utils/src/mputl.c

A    qsdk/package/mp_utils/src/mputl_mac.c

A    qsdk/package/mp_utils/Makefile

U    qsdk/.config

Summary of conflicts:

  Text conflicts: 28

  Tree conflicts: 19

[/home/firstpw/IPQ/Branch]