鐗堟潈澹版槑錛氬彲浠ヤ換鎰忚漿杞斤紝杞澆鏃惰鍔″繀浠ヨ秴閾炬帴褰㈠紡鏍囨槑鏂囩珷鍘熷鍑哄鍜屼綔鑰呬俊鎭?/div>
svn 鐨?merge鍏跺疄寰堝ソ鐢紝褰撶劧鍓嶆彁鏄綘鏄庣櫧浜唖vn merge榪欎釜鍛戒護(hù)錛岃繕濂斤紝鎴戠敤浜嗗ぇ綰︿竴騫存槑鐧戒簡榪欎釜鍛戒護(hù) -___-!!
璺熷ぇ瀹惰涓涓嬬敤娉曪紝姣斿鎴戜滑瑕佹妸鍒嗘敮merge鍒頒富騫蹭笂
# svn merge --help
merge: Apply the differences between two sources to a working copy path.
usage: 1. merge sourceURL1[@N] sourceURL2[@M] [WCPATH]
2. merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH]
3. merge [-c M | -r N:M] SOURCE[@REV] [WCPATH]
鎴戜滑浠ョ涓涓負(fù)渚?br /> merge sourceURL1[@N] sourceURL2[@M] [WCPATH]
榪欎釜help閲岄潰鎻愮ず錛宮erge闇瑕佷笁涓弬鏁?br /> sourceURL1錛宻ourceURL2鐨勫惈涔夊茍涓嶆槸涓や釜鍒嗘敮錛屾垨鑰呬竴涓垎鏀竴涓富騫詫紝鑰屾槸鍚屼竴涓垎鏀殑涓や釜鐘舵侊紝鎴栬呰鏄袱涓増鏈傚榪欎袱涓増鏈仛涓涓猟iff錛岀劧鍚庢妸diff鐨勭粨鏋滐紝搴旂敤鍒版渶鍚庣殑鍙傛暟WCPATH涓婏紝W(xué)CPATH浠ｈ〃鏄竴涓湰鍦板凡緇廲heckout鐨勫伐浣滃尯
svn merge鐨勬濇兂鏄痙iff and apply
姣斿錛屾垜寮鍙戜竴涓」鐩彨鍋歱roj
鐩綍緇撴瀯鏄?br /> proj/trunk
proj/branches
proj/tags
(鐪佺暐浜唄ttp:// 涔嬪悗鐨勶紝鍙槸鐩稿璺緞錛屼絾鏄湡姝ｄ嬌鐢ㄦ椂鍊欎笉鑳界渷鐣?
褰撶増鏈揪鍒?00鐨勬椂鍊欙紝鎴戝喅瀹氬仛涓涓猙ranch榪涜涓浜涘叾浠栧紑鍙?br />
璺熷ぇ瀹惰涓涓嬬敤娉曪紝姣斿鎴戜滑瑕佹妸鍒嗘敮merge鍒頒富騫蹭笂
# svn merge --help
merge: Apply the differences between two sources to a working copy path.
usage: 1. merge sourceURL1[@N] sourceURL2[@M] [WCPATH]
2. merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH]
3. merge [-c M | -r N:M] SOURCE[@REV] [WCPATH]
鎴戜滑浠ョ涓涓負(fù)渚?br /> merge sourceURL1[@N] sourceURL2[@M] [WCPATH]
榪欎釜help閲岄潰鎻愮ず錛宮erge闇瑕佷笁涓弬鏁?br /> sourceURL1錛宻ourceURL2鐨勫惈涔夊茍涓嶆槸涓や釜鍒嗘敮錛屾垨鑰呬竴涓垎鏀竴涓富騫詫紝鑰屾槸鍚屼竴涓垎鏀殑涓や釜鐘舵侊紝鎴栬呰鏄袱涓増鏈傚榪欎袱涓増鏈仛涓涓猟iff錛岀劧鍚庢妸diff鐨勭粨鏋滐紝搴旂敤鍒版渶鍚庣殑鍙傛暟WCPATH涓婏紝W(xué)CPATH浠ｈ〃鏄竴涓湰鍦板凡緇廲heckout鐨勫伐浣滃尯
svn merge鐨勬濇兂鏄痙iff and apply
姣斿錛屾垜寮鍙戜竴涓」鐩彨鍋歱roj
鐩綍緇撴瀯鏄?br /> proj/trunk
proj/branches
proj/tags
(鐪佺暐浜唄ttp:// 涔嬪悗鐨勶紝鍙槸鐩稿璺緞錛屼絾鏄湡姝ｄ嬌鐢ㄦ椂鍊欎笉鑳界渷鐣?
褰撶増鏈揪鍒?00鐨勬椂鍊欙紝鎴戝喅瀹氬仛涓涓猙ranch榪涜涓浜涘叾浠栧紑鍙?br />
[Reversion:100]
$svn cp proj/trunk proj/branches/proj_branch_1
OK Reversion:101
鐒跺悗錛宼runk鍜宲roj_branch_1閮藉湪寮鍙?wbr>錛屽埌浜嗘煇涓涓増鏈紝姣斿150錛宐ranch寮鍙戝畬鎴?wbr>錛岄渶瑕乵erge鍥炲埌trunk
姝ゆ椂鐨勭洰褰曠粨鏋勬槸
[Reversion:150]
proj/trunk
proj/branches/proj_branch_1
proj/tags
鎸夌収svn鐨勫疄鐜幫紝鎴戦渶瑕佺煡閬損roj_branch
閭ｄ箞鎵ц
$cd proj/trunk
$svn merge proj/branches/proj_branch_1
鍏跺疄錛岀涓涓猆RL錛堟垜浠О涔嬩負(fù)宸﹁竟錛夛紝涓鴻搗濮嬬姸鎬侊紝閫氳繃鏈鍚庣殑
$svn st灝卞彲浠ョ湅鍒板彉鍖栦簡
榪欓噷鐨勪竴涓棶棰樻槸濡備綍鑾峰彇榪欎釜cp涔嬪悗鐨勭増鏈紝涔熷氨鏄緥瀛愪腑鐨?
鍙互浣跨敤svn log閲岄潰鐨?-stop-on-copy鍛戒護(hù)
$svn log --stop-on-copy proj/branches/proj_branch_1
浼?xì)鍒癱p鐨勬椂鍊欏仠涓嬫潵錛岄偅閲岃竟鏍囨敞鐨勭増鏈氨鏄渶瑕佺殑鐗堟湰
姣斿錛岃繖鏄竴涓湡姝ｉ」鐩殑涓涓緥瀛愶紝
------------------------------
r995 | yinweiming | 2007-10-24 09:07:08 +0800 (涓? 24 10鏈?2007) | 1 line
Create a branch for proj client using
------------------------------
鍏朵腑鐨剅995錛?95灝辨槸鎴戦渶瑕佺殑鐗堟湰
錛堣鏄庝竴涓嬶紝commit鏃跺欏啓commet鐨勫ソ澶?wbr>錛屾瘮濡傝繖閲屾垜灝卞緢鏄庣‘鐨勮偗瀹氳繖鏄痓ranch鐨勮搗濮嬬偣錛?br />
瀵逛簬svn merge鐨勫彟澶栫殑鐢ㄦ硶涔熸槸綾諱技錛屽彧瑕佹槸鏄庣櫧浜?br /> 浠栨槸鏍規(guī)嵁宸﹁竟錛屽彸杈圭敓鎴恉iff錛岀劧鍚庡簲鐢ㄥ埌鏈湴鐨勪竴涓伐浣滃尯灝?wbr>瀹規(guī)槗鐞嗚В浜嗐?br />
榪樻湁鍙互浣跨敤svn merge --dry-run鏉ユā鎷熷亣瑁卪erge涓涓嬶紝鐪嬩竴涓媘erge
鑰屽浜巑erge鐨刪elp閲岄潰鐨?3. merge [-c M | -r N:M] SOURCE[@REV] [WCPATH]
榪欎釜涔熷緢瀹規(guī)槗鐞嗚В錛屽氨鏄彇 SOURCE 榪欎釜涓滆タ錛岀増鏈琋錛孧涔嬮棿鐨勫尯鍒紝浣滅敤鍦╓CPATH榪欎釜鏈湴宸ヤ綔鍖轟笂
娉ㄦ剰錛?br /> 鍋歜ranch鍗冧竾鍒牴鎹湰鍦頒慨鏀硅繃鐨勫伐浣滃尯鍋氾紝涓瀹氬熀浜庢煇涓涓猆RL鐨勭増鏈仛
$svn cp proj/trunk proj/branches/proj_branch_1
OK Reversion:101
鐒跺悗錛宼runk鍜宲roj_branch_1閮藉湪寮鍙?wbr>錛屽埌浜嗘煇涓涓増鏈紝姣斿150錛宐ranch寮鍙戝畬鎴?wbr>錛岄渶瑕乵erge鍥炲埌trunk
姝ゆ椂鐨勭洰褰曠粨鏋勬槸
[Reversion:150]
proj/trunk
proj/branches/proj_branch_1
proj/tags
鎸夌収svn鐨勫疄鐜幫紝鎴戦渶瑕佺煡閬損roj_branch
閭ｄ箞鎵ц
$cd proj/trunk
$svn merge proj/branches/proj_branch_1
鍏跺疄錛岀涓涓猆RL錛堟垜浠О涔嬩負(fù)宸﹁竟錛夛紝涓鴻搗濮嬬姸鎬侊紝閫氳繃鏈鍚庣殑
$svn st灝卞彲浠ョ湅鍒板彉鍖栦簡
榪欓噷鐨勪竴涓棶棰樻槸濡備綍鑾峰彇榪欎釜cp涔嬪悗鐨勭増鏈紝涔熷氨鏄緥瀛愪腑鐨?
鍙互浣跨敤svn log閲岄潰鐨?-stop-on-copy鍛戒護(hù)
$svn log --stop-on-copy proj/branches/proj_branch_1
浼?xì)鍒癱p鐨勬椂鍊欏仠涓嬫潵錛岄偅閲岃竟鏍囨敞鐨勭増鏈氨鏄渶瑕佺殑鐗堟湰
姣斿錛岃繖鏄竴涓湡姝ｉ」鐩殑涓涓緥瀛愶紝
------------------------------
r995 | yinweiming | 2007-10-24 09:07:08 +0800 (涓? 24 10鏈?2007) | 1 line
Create a branch for proj client using
------------------------------
鍏朵腑鐨剅995錛?95灝辨槸鎴戦渶瑕佺殑鐗堟湰
錛堣鏄庝竴涓嬶紝commit鏃跺欏啓commet鐨勫ソ澶?wbr>錛屾瘮濡傝繖閲屾垜灝卞緢鏄庣‘鐨勮偗瀹氳繖鏄痓ranch鐨勮搗濮嬬偣錛?br />
瀵逛簬svn merge鐨勫彟澶栫殑鐢ㄦ硶涔熸槸綾諱技錛屽彧瑕佹槸鏄庣櫧浜?br /> 浠栨槸鏍規(guī)嵁宸﹁竟錛屽彸杈圭敓鎴恉iff錛岀劧鍚庡簲鐢ㄥ埌鏈湴鐨勪竴涓伐浣滃尯灝?wbr>瀹規(guī)槗鐞嗚В浜嗐?br />
榪樻湁鍙互浣跨敤svn merge --dry-run鏉ユā鎷熷亣瑁卪erge涓涓嬶紝鐪嬩竴涓媘erge
鑰屽浜巑erge鐨刪elp閲岄潰鐨?3. merge [-c M | -r N:M] SOURCE[@REV] [WCPATH]
榪欎釜涔熷緢瀹規(guī)槗鐞嗚В錛屽氨鏄彇 SOURCE 榪欎釜涓滆タ錛岀増鏈琋錛孧涔嬮棿鐨勫尯鍒紝浣滅敤鍦╓CPATH榪欎釜鏈湴宸ヤ綔鍖轟笂
娉ㄦ剰錛?br /> 鍋歜ranch鍗冧竾鍒牴鎹湰鍦頒慨鏀硅繃鐨勫伐浣滃尯鍋氾紝涓瀹氬熀浜庢煇涓涓猆RL鐨勭増鏈仛
鎴戝氨鍚冭繃榪欎釜浜?br />
diff鐨勬椂鍊欙紝diff涓嶅嚭鏉ワ紝鍥犱負(fù)鍩轟簬鏈湴宸ヤ綔鍖虹殑
]]>
鐢ㄤ笅闈㈣繖涓剼鏈氨鍙互瑙ｅ喅浜嗭紝鏉ヨ嚜tortoiseSVN瀹樼綉錛?http://m.tkk7.com/Files/lingy/change-svn-wc-format.rar 鐢ㄦ硶濡傦細(xì)
python change-svn-wc-format.py ./projctName "1.4" --verbose
闄勪歡錛氬湪鏂囦歡涓傘傘傘傘?br />
榪樺ソ鎴戝湪windows涓嬭浜?python 錛岄《python ~
]]>