锘??xml version="1.0" encoding="utf-8" standalone="yes"?>
1.鍒涘緩鍒嗘敮
鍒涘緩鍒嗘敮瀹為檯涓婂氨鏄皢紼嬪簭copy涓浠藉埌鎸囧畾鐨勫垎鏀洰褰曪紝濡備笅鍥劇ず錛?/p>
鍦ㄩ」鐩悕縐頒笂鐐瑰嚮鍙抽敭錛屽脊鍑鴻彍鍗曪紝閫夋嫨“Team”錛屽啀閫夋嫨“Branch/Tag”錛屽脊鍑轟笅闈㈢殑欏甸潰錛?nbsp;
涓婂浘涓殑“Copy to URL”濉啓鍒涘緩鏂板垎鏀殑璺緞鍦板潃錛屽悗闈細(xì)灝嗙▼搴?/span>copy鍒拌鐩綍涓嬶紝褰㈡垚鏂扮殑鍒嗘敮銆傜偣鍑?#8220;Next”:
閫夋嫨褰撳墠鏈鏂扮殑鐗堟湰錛岀偣鍑?#8220;Next”
濡傛灉鍕鵑変簡涓婂浘涓嬮潰鐨?/span>switch working copy to new branch/tag錛?/span>eclipse鐨勭▼搴忛」鐩細(xì)鑷姩鍒囨崲鍒板垎鏀笅銆傝繖閲屾垜浠笉閫夋嫨錛屽緟浼?xì)鑷繁鍒囨?/span>銆?/p> 榪欐牱灝卞垱寤轟簡涓涓?.0鐨勫垎鏀?/p> 2.鍚堝茍 鍙互浠庝富騫插悎騫跺埌鍒嗘敮錛屼篃鍙互浠庡垎鏀悎騫跺埌涓誨共錛屾牴鎹渶瑕佸彲浠ラ夋嫨鍚堥傜殑閫夐」錛屽涓嬪浘錛?/span> 涓婂浘涓殑閫夐」錛?/span> 1) 浠庝富騫插悎騫跺埌鍒嗘敮 2) 浠庡垎鏀悎騫跺埌涓誨共 3) 灝嗕富騫蹭笂鐨勪慨鏀瑰悎騫跺埌鍒嗘敮 4) 鍚堝茍2涓垎鏀埌涓誨共 5) 浠庝富騫插埌鍒嗘敮錛屾墜宸ユ寚瀹氫笉闇瑕佸悎騫剁殑淇敼 6) 浠庝富騫插埌鍒嗘敮錛屾墜宸ユ寚瀹氳鍚堝茍鐨勪慨鏀?/p> 涓婂浘鏄劇ず娌℃湁浠諱綍淇敼錛屾墍浠ヤ笉鐢ㄨ繘琛屽悎騫躲?/span> 3.鍒囨崲 鍦ㄩ」鐩悕縐頒笂鐐瑰嚮鍙抽敭錛岄夋嫨“Team” –> “switch to another Branch/Tag/Revision”銆?/span> 閫夋嫨闇瑕佸垏鎹㈢殑鐩殑鍦板潃錛岀偣鍑?/span>ok鍗沖彲銆?/span> 榪欐牱錛屽湪欏圭洰閲屽氨鍙互鍦ㄤ富騫插拰鑻ュ共鍒嗘敮闂磋繘琛屼換鎰忓垏鎹紝鏉ュ疄鐜板涓嶅悓鐗堟湰/鍒嗘敮鐨勭▼搴忚繘琛屼慨鏀規(guī)彁浜ゆ搷浣溿?/span>
]]>
1.鍒涘緩鍒嗘敮
鍒涘緩鍒嗘敮瀹為檯涓婂氨鏄皢紼嬪簭copy涓浠藉埌鎸囧畾鐨勫垎鏀洰褰曪紝濡備笅鍥劇ず錛?/p>
鍦ㄩ」鐩悕縐頒笂鐐瑰嚮鍙抽敭錛屽脊鍑鴻彍鍗曪紝閫夋嫨“Team”錛屽啀閫夋嫨“Branch/Tag”錛屽脊鍑轟笅闈㈢殑欏甸潰錛?nbsp;
涓婂浘涓殑“Copy to URL”濉啓鍒涘緩鏂板垎鏀殑璺緞鍦板潃錛屽悗闈細(xì)灝嗙▼搴?/span>copy鍒拌鐩綍涓嬶紝褰㈡垚鏂扮殑鍒嗘敮銆傜偣鍑?#8220;Next”:
閫夋嫨褰撳墠鏈鏂扮殑鐗堟湰錛岀偣鍑?#8220;Next”
濡傛灉鍕鵑変簡涓婂浘涓嬮潰鐨?/span>switch working copy to new branch/tag錛?/span>eclipse鐨勭▼搴忛」鐩細(xì)鑷姩鍒囨崲鍒板垎鏀笅銆傝繖閲屾垜浠笉閫夋嫨錛屽緟浼?xì)鑷繁鍒囨?/span>銆?/p> 榪欐牱灝卞垱寤轟簡涓涓?.0鐨勫垎鏀?/p> 2.鍚堝茍 鍙互浠庝富騫插悎騫跺埌鍒嗘敮錛屼篃鍙互浠庡垎鏀悎騫跺埌涓誨共錛屾牴鎹渶瑕佸彲浠ラ夋嫨鍚堥傜殑閫夐」錛屽涓嬪浘錛?/span> 涓婂浘涓殑閫夐」錛?/span> 1) 浠庝富騫插悎騫跺埌鍒嗘敮 2) 浠庡垎鏀悎騫跺埌涓誨共 3) 灝嗕富騫蹭笂鐨勪慨鏀瑰悎騫跺埌鍒嗘敮 4) 鍚堝茍2涓垎鏀埌涓誨共 5) 浠庝富騫插埌鍒嗘敮錛屾墜宸ユ寚瀹氫笉闇瑕佸悎騫剁殑淇敼 6) 浠庝富騫插埌鍒嗘敮錛屾墜宸ユ寚瀹氳鍚堝茍鐨勪慨鏀?/p> 涓婂浘鏄劇ず娌℃湁浠諱綍淇敼錛屾墍浠ヤ笉鐢ㄨ繘琛屽悎騫躲?/span> 3.鍒囨崲 鍦ㄩ」鐩悕縐頒笂鐐瑰嚮鍙抽敭錛岄夋嫨“Team” –> “switch to another Branch/Tag/Revision”銆?/span> 閫夋嫨闇瑕佸垏鎹㈢殑鐩殑鍦板潃錛岀偣鍑?/span>ok鍗沖彲銆?/span> 榪欐牱錛屽湪欏圭洰閲屽氨鍙互鍦ㄤ富騫插拰鑻ュ共鍒嗘敮闂磋繘琛屼換鎰忓垏鎹紝鏉ュ疄鐜板涓嶅悓鐗堟湰/鍒嗘敮鐨勭▼搴忚繘琛屼慨鏀規(guī)彁浜ゆ搷浣溿?br />
鍙傝冿細(xì)
Overview of CollabNet Merge Client
https://desktop-eclipse.open.collab.net/servlets/ProjectProcess?pageID=MEuUjb&freeformpage=Merge%20Client
eclipse涓皢SVN鍒嗘敮鍚堝茍鍒頒富騫茬殑鏂規(guī)硶
http://www.darrenfang.com/merge-branches-to-trunk-in-eclipse.html
]]>
鍦ㄥ疄鐜頒笂錛宐ranch鍜宼ag錛屽浜巗vn閮芥槸浣跨敤copy瀹炵幇鐨勶紝鎵浠ヤ粬浠湪榛樿鐨勬潈闄愪笂鍜屼竴鑸殑鐩綍娌℃湁鍖哄埆銆傝嚦浜庝綍鏃剁敤tag錛屼綍鏃剁敤branch錛屽畬鍏ㄧ敱浜轟富瑙傜殑鏍規(guī)嵁瑙勮寖鍜岄渶瑕佹潵閫夋嫨錛岃屼笉鏄己鍒剁殑錛堟瘮濡俢vs錛夈備竴鑸儏鍐典笅錛宼ag錛屾槸鐢ㄦ潵鍋氫竴涓猰ilestone鐨勶紝涓嶇鏄笉鏄痳elease錛岄兘鏄竴涓彲鐢ㄧ殑鐗堟湰銆傝繖閲岋紝搴旇鏄彧璇葷殑銆傛洿澶氱殑鏄竴涓樉紺虹敤鐨勶紝緇欎漢涓涓彲璇伙紙readable錛夌殑鏍囪銆俠ranch錛屾槸鐢ㄦ潵鍋氬茍琛屽紑鍙戠殑錛岃繖閲岀殑騫惰鏄寚鍜宼runk榪涜姣旇緝銆傛瘮濡傦紝3.0寮鍙戝畬鎴愶紝榪欎釜鏃跺欒鍋氫竴涓猼ag錛宼ag_release_3_0錛岀劧鍚庡熀浜庤繖涓猼ag鍋歳elease錛屾瘮濡傚畨瑁呯▼搴忕瓑銆倀runk榪涘叆3.1鐨勫紑鍙戯紝浣嗘槸3.0鍙戠幇浜哹ug錛岄偅涔堝氨闇瑕佸熀浜巘ag_release_3_0鍋氫竴涓猙ranch錛宐ranch_bugfix_3_0錛屽熀浜庤繖涓猙ranch榪涜bugfix錛岀瓑鍒癰ugfix緇撴潫錛屽仛涓涓猼ag錛宼ag_release_3_0_1錛岀劧鍚庯紝鏍規(guī)嵁闇瑕佸喅瀹歜ranch_bugfix_3_0鏄惁騫跺叆trunk銆傚浜巗vn榪樿娉ㄦ剰鐨勪竴鐐癸紝灝辨槸瀹冩槸鍏ㄥ眬鐗堟湰鍙鳳紝鍏跺疄榪欎釜灝辨槸涓涓猼ag鐨勬爣璁幫紝鎵浠ユ垜浠粡甯稿彲浠ョ湅鍒幫紝浠涔堜粈涔坮elease錛屽熀浜巟xx欏圭洰鐨?xxxx鐗堟湰銆傚氨鏄繖涓剰鎬濅簡銆備絾鏄紝瀹冭繕鏄庣‘鐨勭粰鍑轟竴涓猼ag鐨勬蹇碉紝灝辨槸鍥犱負(fù)榪欎釜鏇村姞鐨勫彲璇伙紝姣曠珶璁頒綇tag_release_1_0瑕佹瘮璁頒綇涓涓緢澶х殑鐗堟湰鍙峰鏄撶殑澶氥?br />
branches錛氬垎鏋?br />SVN涓璽ag branch trunk鐨勭敤娉曪紝棣栧厛鐪嬩竴涓媌ranches鐨勪粙緇嶃傚綋澶氫釜浜哄悎浣滐紝鍙兘鏈夎繖鏍風(fēng)殑鎯呭喌鍑虹幇錛欽ohn紿佺劧鏈変釜鎯蟲硶錛岃窡鍘熷厛鐨勮璁′笉澶竴鑷達(dá)紝鍙兘鏄姛鑳界殑娣誨姞鎴栬呮棩蹇楁牸寮忕殑鏀硅繘絳夌瓑錛屾昏岃█涔嬶紝榪欎釜鎯蟲硶鍙兘闇瑕佽姳涓孌墊椂闂存潵瀹屾垚錛岃岃繖涓繃紼嬩腑錛孞ohn鐨勪竴浜涙搷浣滃彲鑳戒細(xì)褰卞搷Sally鐨勫伐浣滐紝John浠庣幇鏈夌殑鐘舵佸崟鐙嚭涓涓猵roject鐨勮瘽錛屽張涓嶈兘鍙?qiáng)鏃跺緱鍒癝ally瀵瑰凡鏈変唬鐮佸仛鐨勪慨姝o紝鑰屼笖鐙珛鍑烘潵鐨勮瘽錛孞ohn鐨勫皾璇曟垚鍔熸椂錛岃窡鍘熸潵鐨勫悎騫朵篃瀛樺湪鍥伴毦銆傝繖鏃舵渶濂界殑瀹炶返鏂規(guī)硶鏄嬌鐢╞ranches銆侸ohn寤虹珛涓涓嚜宸辯殑branch錛岀劧鍚庡湪閲岄潰瀹為獙錛屽繀瑕佺殑鏃跺欎粠Sally鐨則runk閲屽彇寰楁洿鏂幫紝鎴栬呭皢鑷繁鐨勯樁孌墊垚鏋滄眹闆嗗埌trunk涓?br />錛坰vncopySourceURL/trunkDestinationURL/branchName-m"Creatingaprivatebranchofxxxx/trunk."錛?br />
trunk錛氫富騫?br />涓誨共錛屼竴鑸潵璇村氨鏄紑鍙戠殑涓昏鍛嗙殑鍦版柟錛?br />
tag: 鍥炬爣
鍦ㄧ粡榪囦簡涓孌墊椂闂寸殑寮鍙戝悗錛岄」鐩埌杈句簡涓涓噷紼嬬闃舵錛屼綘鍙兘鎯寵褰曡繖涓闃舵鐨勪唬鐮佺殑鐘舵侊紝閭d箞浣犲氨闇瑕佺粰浠g爜鎵撲笂鏍囩銆?br />(svncpfile:///svnroot/mojavescripts/trunkfile:///svnroot/mojavescripts/tags/mirrorutils_rel_0_0_1-m"tagedmirrorutils_rel_0_0_1")鍙︽湁涓璇達(dá)紝鏃犳墍璋撹皝瀵硅皝閿欍?br />
trunk錛氳〃紺哄紑鍙戞椂鐗堟湰瀛樻斁鐨勭洰褰曪紝鍗沖湪寮鍙戦樁孌電殑浠g爜閮芥彁浜ゅ埌璇ョ洰褰曚笂銆?br />
branches錛氳〃紺哄彂甯冪殑鐗堟湰瀛樻斁鐨勭洰褰曪紝鍗抽」鐩笂綰挎椂鍙戝竷鐨勭ǔ瀹氱増鏈瓨鏀懼湪璇ョ洰褰曚腑銆?br />
tags錛氳〃紺烘爣絳懼瓨鏀劇殑鐩綍銆?br />
鍦ㄨ繖闇瑕佽鏄庝笅鍒嗕笁涓洰褰曠殑鍘熷洜錛屽鏋滈」鐩垎涓轟竴鏈熴佷簩鏈熴佷笁鏈熺瓑錛岄偅涔堜竴鏈熶笂綰挎椂鐨勭ǔ瀹氱増鏈氨搴旇鍦ㄤ竴鏈熷畬鎴愭椂灝嗕唬鐮乧opy鍒癰ranches涓婏紝榪欐牱浜屾湡寮鍙戠殑浠g爜灝卞涓鏈熺殑浠g爜娌℃湁褰卞搷錛屽鏂板鐨勬ā鍧楀氨涓嶄細(xì)閮ㄧ講鍒扮敓浜х幆澧冧笂銆傝宐ranches涓婄殑紼沖畾鐨勭増鏈氨鏄彂甯冨埌鐢熶駭鐜涓婄殑浠g爜錛屽鏋滅敤鎴蜂嬌鐢ㄧ殑榪囩▼涓彂鐜版湁bug錛屽垯鍙鍦╞ranches涓婁慨鏀硅bug錛屼慨鏀瑰畬bug鍚庡啀緙栬瘧branches涓婃渶鏂扮殑浠g爜鍙戝竷鍒扮敓浜х幆澧冨嵆鍙倀ags鐨勪綔鐢ㄦ槸灝嗗湪branches涓婁慨鏀圭殑bug鐨勪唬鐮佸悎騫跺埌trunk涓婃椂鍒涘緩涓増鏈爣璇嗭紝浠ュ悗branches涓婁慨鏀圭殑bug浠g爜鍐嶅悎騫跺埌trunk涓婃椂灝變粠tags鐨剉ersion鍒癰ranches鏈鏂扮殑version鍚堝茍鍒皌runk錛屼互淇濊瘉鍓嶆湡淇敼鐨刡ug浠g爜涓嶄細(xì)鍐嶅悎騫躲?br />
-------------------------------------------------------------------------------------------
浠嬬粛SVN涓璽ag branch trunk鐢ㄦ硶鏃訛紝涓鐩翠互鏉ョ敤svn鍙槸褰撲綔cvs錛屼篃浠庢潵娌℃湁浠旂粏鐪嬭繃鏂囨。錛岀洿鍒頒粖澶╃敤鍒幫紝鎵嶅幓緲葷湅svnbook鏂囨。錛屾儹鎰?br />
闇姹備竴錛?br />鏈変竴涓鎴鋒兂瀵逛駭鍝佸仛瀹氬埗錛屼絾鏄垜浠茍涓嶆兂淇敼鍘熸湁鐨剆vn涓璽runk鐨勪唬鐮併?br />鏂規(guī)硶錛?br />鐢╯vn寤虹珛涓涓柊鐨刡ranches錛屼粠榪欎釜branche鍋氫負(fù)涓涓柊鐨勮搗鐐規(guī)潵寮鍙?br />svncopysvn://server/trunksvn://server/branches/ep-m"initep"
Tip:
濡傛灉浣犵殑svn涓互鍓嶆病鏈塨ranches榪欎釜鐨勭洰褰曪紝鍙湁trunk榪欎釜錛屼綘鍙互鐢?br />svnmkdirbranches鏂板緩涓洰褰?br />
闇姹備簩錛?br />浜у搧寮鍙戝凡緇忓熀鏈畬鎴愶紝騫朵笖閫氳繃寰堜弗鏍肩殑嫻嬭瘯錛岃繖鏃跺欐垜浠氨鎯沖彂甯冪粰瀹㈡埛浣跨敤錛屽彂甯冩垜浠殑1.0鐗堟湰
svncopysvn://server/trunksvn://server/tags/release-1.0-m"1.0released"鍜︼紝榪欎釜鍜宐ranches鏈変粈涔堝尯鍒紝濂藉儚鍟ュ尯鍒篃娌℃湁錛?br />鏄殑錛宐ranches鍜宼ags鏄竴鏍風(fēng)殑錛岄兘鏄洰褰曪紝鍙槸鎴戜滑涓嶄細(xì)瀵硅繖涓猺elease-1.0鐨則ag鍋氫慨鏀逛簡錛屼笉鍐嶆彁浜や簡錛屽鏋滄彁浜ら偅涔堝氨鏄痓ranches
闇姹備笁錛?br />鏈変竴澶╋紝紿佺劧鍦╰runk涓嬬殑core涓彂鐜頒竴涓嚧鍛界殑bug,閭d箞鎵鏈夌殑branches涓瀹氫篃涓鏍蜂簡錛岃鎬庝箞鍔烇紵
svn-r148:149mergesvn://server/trunkbranches/ep鍏朵腑148鍜?49鏄袱嬈′慨鏀圭殑鐗堟湰鍙楓係VN涓璽ag branch trunk鐢ㄦ硶浠嬬粛瀹屾瘯銆?img src ="http://m.tkk7.com/paulwong/aggbug/413344.html" width = "1" height = "1" />
]]>