锘??xml version="1.0" encoding="utf-8" standalone="yes"?>
鐩綍
涓銆佸熀鏈蹇?/p>
1銆佷粈涔堟槸鐗堟湰鎺у埗
2銆佷粈涔堟槸 Subversion
3銆佺増鏈簱(repository)
浜屻佸畨瑁?/p>
1銆佸噯澶囧伐浣?/p>
2銆佸畨瑁?a title="鏈嶅姟鍣? target="_blank" style="text-decoration: none; color: #000000; cursor: pointer; ">鏈嶅姟鍣?/a>绔拰瀹㈡埛绔?/p>
3銆佸緩绔嬬増鏈簱(Repository)
4銆佽繍琛岀嫭绔嬫湇鍔″櫒
涓夈佸熀鏈厤緗?/p>
1銆侀厤緗敤鎴峰拰鏉冮檺
2銆佸垵濮嬪寲瀵煎叆
鍥涖佸熀鏈搷浣滄祦紼?/p>
1銆佸彇鍑?check out)
2銆佸瓨鍏?check in)/鎻愪氦(commit)
------------------------------------------------------------------鍒?鍓?綰?--------------------------------------------------------------
涓銆佸熀鏈蹇?/strong>
1銆佷粈涔堟槸鐗堟湰鎺у埗
綆鍗曠偣鏉ヨ錛岀増鏈帶鍒跺氨鏄暟鎹粨搴擄紝瀹冨彲浠ヨ褰曚綘瀵規枃浠剁殑姣忔鏇存敼銆傝繖鏍鳳紝灝辯畻浣犲湪鏄忓ぉ榛戝湴鐨勬敼浜嗗嚑涓湀鍚庤佹澘璇翠笉瑕佷簡錛岃繕鏄寜鐓ц繃鍘婚偅鏍鳳紝浣犱篃涓嶄細鎶撶媯錛岀畝鍗曠殑鎭㈠鐗堟湰鎿嶄綔灝辨悶瀹氫竴鍒囥?/p>
2銆佷粈涔堟槸 Subversion
Subversion鏄竴涓嚜鐢?寮婧愮増鏈帶鍒剁郴緇燂紝瀹冪鐞嗘枃浠跺拰鐩綍鍙互瓚呰秺鏃墮棿銆備竴緇勬枃浠跺瓨鏀懼湪涓績鐗堟湰搴擄紝榪欎釜鐗堟湰搴撳緢鍍忎竴涓櫘閫氱殑鏂囦歡鏈嶅姟鍣紝鍙槸瀹冨彲浠ヨ褰曟瘡涓嬈℃枃浠跺拰鐩綍鐨勪慨鏀癸紝榪欎究浣夸綘鍙互鍙栧緱鏁版嵁浠ュ墠鐨勭増鏈紝浠庤屽彲浠ユ鏌ユ墍浣滅殑鏇存敼銆備粠榪欎釜鏂歸潰鐪嬶紝璁稿浜烘妸鐗堟湰鎺у埗緋葷粺褰撲綔涓縐?#8220;鏃墮棿鏈哄櫒”銆?/p>
Subversion鍙互閫氳繃緗戠粶璁塊棶瀹冪殑鐗堟湰搴擄紝浠庤屼嬌鐢ㄦ埛鍙互鍦ㄤ笉鍚岀殑鐢佃剳涓婁嬌鐢ㄣ備竴瀹氱▼搴︿笂鍙互璇達紝鍏佽鐢ㄦ埛鍦ㄥ悇鑷殑鍦版柟淇敼鍚屼竴浠芥暟鎹槸淇冭繘鍗忎綔銆傝繘灞曞彲鑳介潪甯哥殑榪呴燂紝騫舵病鏈変竴涓墍鏈夌殑鏀瑰彉閮戒細鍙栧緱鏁堟灉鐨勯氶亾錛岀敱浜庢墍鏈夌殑宸ヤ綔閮芥湁鍘嗗彶鐗堟湰錛屼綘涓嶅繀鎷呭績鐢變簬澶卞幓鏌愪釜閫氶亾鑰屽獎鍝嶈川閲忥紝濡傛灉瀛樺湪涓嶆紜殑鏀瑰彉錛屽彧瑕佸彇娑堟敼鍙樸?/p>
涓浜涚増鏈帶鍒剁郴緇熶篃鏄?a title="杞歡" target="_blank" style="text-decoration: none; color: #000000; cursor: pointer; ">杞歡
閰嶇疆綆$悊(SCM)緋葷粺錛岃繖縐嶇郴緇熺粡榪囩壒瀹氱殑綺懼閥璁捐鏉ョ鐞嗘簮浠g爜錛屾湁璁稿鍏充簬杞歡寮鍙戠殑鐗規?#8212;鏈韓鐞嗚В緙栫▼璇█銆佹垨鑰呮彁渚涙瀯寤虹▼搴忕殑宸ュ叿銆傜劧鑰岋紝Subversion涓嶆槸榪欐牱涓涓郴緇燂紝瀹冩槸涓涓氱敤緋葷粺錛屽彲浠ョ鐞嗕換浣曠被鍨嬬殑鏂囦歡闆嗭紝瀵逛綘榪欏彲鑳芥槸婧愪唬鐮侊紝瀵瑰埆浜猴紝鍙兘鏄竴涓揣鐗╂姤浠峰崟鎴栬呮槸涔︾ǹ錛屾垨鑰呮槸鐢靛獎鍓緫絳夈?/p>3銆佺増鏈簱(repository)
Subversion 鐨勬牳蹇冨氨鏄?repository 錛屼腑鏂囩炕璇戞垚“鐗堟湰搴?#8221;銆傚氨鏄綅浜庢湇鍔″櫒绔紝緇熶竴綆$悊鍜屽偍瀛樻暟鎹殑鍦版柟銆?/p>
浜屻佸畨瑁?/strong>
Subversion鐨勮璁″寘鎷竴涓娊璞$殑緗戠粶灞傦紝榪欐剰鍛崇潃鐗堟湰搴撳彲浠ラ氳繃鍚勭鏈嶅姟鍣?/a>榪涚▼璁塊棶銆傜悊璁轟笂璁詫紝Subversion鍙互浣跨敤鏃犻檺鏁伴噺鐨勭綉緇滃崗璁疄鐜幫紝鐩墠瀹炶返涓瓨鍦ㄧ潃涓ょ鏈嶅姟鍣?/a>銆?/p> • SVNServer錛歴vnserve 鏄竴涓皬鐨?涔熷彨杞誨瀷鐨?銆佺嫭绔嬫湇鍔″櫒錛屼嬌鐢ㄨ嚜宸卞畾涔夌殑鍗忚鍜屽鎴風銆?浣滆呮敞錛氫互涓嬬О榪欑鏈嶅姟鍣ㄤ負“svnserver鏈嶅姟鍣?#8221;銆? • ApacheSVN錛欰pache鏄渶嫻佽鐨剋eb鏈嶅姟鍣紝閫氳繃浣跨敤 mod_dav_svn 妯″潡錛孉pache鍙互璁塊棶鐗堟湰搴擄紝騫朵笖鍙互浣垮鎴風浣跨敤HTTP鐨勬墿灞曞崗璁甒ebDAV/DeltaV榪涜璁塊棶銆?浣滆呮敞錛氫互涓嬬О榪欑鏈嶅姟鍣ㄤ負“ApacheSVN鏈嶅姟鍣?#8221;銆? 涓嬮潰浠嬬粛 SVNServer 鏈嶅姟鍣ㄧ殑瀹夎錛孉pacheSVN 鏈嶅姟鍣ㄧ殑瀹夎浣跨敤璇風湅鎴戝啓鐨勩奡ubversion楂樼駭搴旂敤錛歋VN鐨勫縐嶈璇佹柟寮忋嬨?/p> 鐜 OS錛歐indows XP SP2 Web錛欰pache 2.2.6 SVN錛歴vn-win32-1.4.6 1銆佸噯澶囧伐浣溿?/p> (1)鑾峰彇 Subversion 鏈嶅姟鍣ㄧ▼搴忋?/p> 鍒板畼鏂圭綉绔?http://subversion.tigris.org/)涓嬭澆鏈鏂扮殑鏈嶅姟鍣ㄥ畨瑁呯▼搴忋傜洰鍓嶆渶鏂扮殑鏄?.4.6鐗堟湰錛屽叿浣撲笅杞藉湴鍧鍦細http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=8100&expandFolder=8100&folderID=91 錛屾敞鎰忔壘 for apache 2.2.x 鐗堟湰鐨勩?/p> (2)鑾峰彇 TortoiseSVN 瀹㈡埛绔▼搴忋?/p> 浠庡畼鏂圭綉绔?http://tortoisesvn.net/downloads 鑾峰彇鏈鏂扮殑 TortoiseSVN 銆俆ortoiseSVN 鏄竴涓鎴風紼嬪簭錛岀敤鏉ヤ笌 subvers 鏈嶅姟鍣ㄧ閫氳銆係ubversion 鑷甫涓涓鎴風紼嬪簭 svn.exe ,浣?TortoiseSVN 鏇村ソ鎿嶄綔錛屾彁楂樻晥鐜囥?/p> 2銆佸畨瑁呮湇鍔″櫒绔拰瀹㈡埛绔?/p> 棣栧厛瀹夎 Apache 2.2.6 錛屽叿浣撳畨瑁呮柟娉曞ぇ瀹跺弬鑰冪浉鍏寵祫鏂欙紝鎴栬呭弬鐪嬫垜鍐欑殑銆奧indows涓嬪畨瑁匒pache 2.2.x銆嬨?/p> 鍏舵瀹夎 Subversion(浠ヤ笅綆縐癝VN)鐨勬湇鍔″櫒绔拰瀹㈡埛绔備笅杞戒笅鏉ョ殑鏈嶅姟鍣ㄧ鏄釜 zip 鍘嬬緝鍖咃紝鐩存帴瑙e帇緙╁嵆鍙紝姣斿鎴戣В鍘嬪埌 E:\subversion 銆傚鎴風瀹夎鏂囦歡鏄釜 exe 鍙墽琛屾枃浠訛紝鐩存帴榪愯鎸夋彁紺哄畨瑁呭嵆鍙紝瀹㈡埛绔畨瑁呭畬鎴愬悗鎻愮ず閲嶅惎銆?/p> 3銆佸緩绔嬬増鏈簱(Repository) 榪愯Subversion鏈嶅姟鍣ㄩ渶瑕侀鍏堣寤虹珛涓涓増鏈簱(Repository)銆傜増鏈簱鍙互鐪嬩綔鏄湇鍔″櫒涓婇泦涓瓨鏀懼拰綆$悊鏁版嵁鐨勫湴鏂廣?/p> 寮濮嬪緩绔嬬増鏈簱銆傞鍏堝緩绔?e:\svn 絀烘枃浠跺す浣滀負鎵鏈夌増鏈簱鐨勬牴鐩綍銆傜劧鍚庯紝榪涘叆鍛戒護琛屽茍鍒囨崲鍒皊ubversion鐨刡in鐩綍銆傝緭鍏ュ涓嬪懡浠わ細 姝ゅ懡浠ゅ湪 E:\svn 涓嬪緩绔嬩竴涓増鏈簱 repos1 銆俽epos1 涓嬮潰浼氳嚜鍔ㄧ敓鎴愪竴浜涙枃浠跺す鍜屾枃浠躲?/p> 鎴戜滑涔熷彲浠ヤ嬌鐢?TortoiseSVN 鍥懼艦鍖栫殑瀹屾垚榪欎竴姝ワ細 鍏堝緩绔嬬┖鐩綍 E:\svn\repos1 錛屾敞鎰忎竴瀹氭槸瑕佺┖鐨勩傜劧鍚庡湪 repos1 鏂囦歡澶逛笂“鍙抽敭->TortoiseSVN->Create Repository here...”錛岀劧鍚庡彲浠ラ夋嫨鐗堟湰搴撴ā寮忥紝榪欓噷浣跨敤榛樿鐨凢SFS鍗沖彲錛岀劧鍚庡氨鍒涘緩浜嗕竴緋誨垪鏂囦歡澶瑰拰鏂囦歡錛屽悓鍛戒護琛屽緩绔嬬殑涓鏍楓?/p> 4銆佽繍琛岀嫭绔嬫湇鍔″櫒 姝ゆ椂 subversion 鏈嶅姟榪樻病鏈夊紑濮嬶紝鍙槸閫氳繃瀹冪殑鍛戒護寤虹珛浜嗙増鏈簱銆傜戶緇湪鍒氭墠鐨勫懡浠ょ獥鍙h緭鍏ワ細 svnserve 灝嗕細鍦ㄧ鍙?3690 絳夊緟璇鋒眰錛?-daemon(涓や釜鐭í綰?閫夐」鍛婅瘔 svnserve 浠ュ畧鎶よ繘紼嬫柟寮忚繍琛岋紝榪欐牱鍦ㄦ墜鍔ㄧ粓姝箣鍓嶄笉浼氶鍑恒傛敞鎰忎笉瑕佸叧闂懡浠よ紿楀彛錛屽叧闂獥鍙d細鎶?svnserve 鍋滄銆?/p> 涓轟簡楠岃瘉svnserve姝e父宸ヤ綔錛屼嬌鐢═ortoiseSVN -> Repo-browser 鏉ユ煡鐪嬬増鏈簱銆傚湪寮瑰嚭鐨?URL 瀵硅瘽妗嗕腑杈撳叆錛?nbsp; 鐐?OK 鎸夐挳鍚庡氨鍙互鐪嬭 repos1 鐗堟湰搴撶殑鐩綍鏍戠粨鏋勪簡錛屽彧涓嶈繃榪欐椂 repos1 鏄釜絀哄簱銆?/p> 浣犱篃鍙互浣跨敤--root閫夐」璁劇疆鏍逛綅緗潵闄愬埗鏈嶅姟鍣ㄧ殑璁塊棶鐩綍錛屼粠鑰屽鍔?a title="瀹夊叏" target="_blank" style="text-decoration: none; color: #000000; cursor: pointer; ">瀹夊叏
浠ュ墠闈㈢殑嫻嬭瘯浣滀負渚嬶紝svnserve 灝嗕細榪愯涓猴細
鐒跺悗TortoiseSVN涓殑鐗堟湰搴撴祻瑙堝櫒URL緙╁噺涓猴細
涓夈佸熀鏈厤緗?/strong>
SVNServer鏈嶅姟鍣?/a>瀹夎瀹屾垚鍚庯紝蹇呴』緇忚繃鍩烘湰閰嶇疆鎵嶈兘浣跨敤銆?/p> 1銆侀厤緗敤鎴峰拰鏉冮檺 鐢ㄦ枃鏈紪杈戝櫒鎵撳紑E:\svn\repos1\conf鐩綍錛屼慨鏀箂vnserve.conf錛?/p> 灝嗭細 鏀逛負錛?nbsp; 鍗沖幓鎺夊墠闈㈢殑 # 娉ㄩ噴絎︼紝娉ㄦ剰鍓嶉潰涓嶈兘鏈夌┖鏍箋?/p> 鐒跺悗淇敼鍚岀洰褰曠殑passwd鏂囦歡錛屽鍔犱竴涓笎鍙鳳細 灝嗭細 澧炲姞甯愬彿錛?/p> 2銆佸垵濮嬪寲瀵煎叆 涓嬮潰灝辨槸灝嗘垜浠殑鏁版嵁(欏圭洰)瀵煎叆鍒拌繖涓増鏈簱錛屼互鍚庡氨鐢辯増鏈簱綆$悊鎴戜滑鐨勬暟鎹傛垜浠殑浠諱綍鏀瑰姩閮戒細琚増鏈簱璁板綍涓嬫潵錛岀敋鑷蟲垜浠嚜宸變涪澶便佹敼閿欐暟鎹椂鐗堟湰搴撲篃鑳藉府鎴戜滑鎵懼洖鏁版嵁銆?/p> 姣斿錛屾垜鍦?d:\wwwroot 涓嬫湁涓?guestbook 鏂囦歡澶癸紝閲岄潰瀛樻斁鐨勬槸鎴戠紪鍐欑殑鐣欒█綈跨▼搴忋傚湪姝ゆ枃浠跺す涓?#8220;鍙抽敭 -> TortoiseSVN -> Import...” 錛屽湪寮瑰嚭瀵硅瘽妗嗙殑“URL of repository”杈撳叆“svn://localhost/repos1/guestbook”銆傚湪“Import message”杈撳叆“瀵煎叆鏁翠釜鐣欒█綈?#8221;浣滀負娉ㄩ噴銆?/p> 鐐?OK 鍚庤姹傝緭鍏ュ笎鍙楓傛垜浠湪鐢ㄦ埛鍚嶅拰瀵嗙爜澶勯兘杈撳叆 test 銆傚畬鎴愬悗 guestbook 涓殑鍐呭鍏ㄩ儴瀵煎叆鍒頒簡 svn://localhost/svn/repos1/guestbook 銆?/p> 鎴戜滑鐪嬪埌鍦?e:\svn\repos1 娌℃湁浠諱綍鍙樺寲錛岃繛涓?guestbook 鏂囦歡澶歸兘娌℃湁寤虹珛錛屽敮涓鐨勫彉鍖栧氨鏄痚:\svn\repos1瀹歸噺鍙樺ぇ浜嗐傚疄闄呬笂鎴戜滑婧恎uestbook涓殑鍐呭宸茬粡瀵煎叆 repos1 鐗堟湰搴撲簡錛屾簮 guestbook 鏂囦歡澶瑰彲浠ュ垹闄や簡銆?/p> 闇瑕佹敞鎰忕殑鏄紝榪欎竴姝ユ搷浣滃彲浠ュ畬鍏ㄥ湪鍙︿竴鍙板畨瑁呬簡 TortoiseSVN 鐨勫鎴鋒満涓婅繘琛屻備緥濡傝繍琛宻vnserve鐨勪富鏈虹殑IP鏄?33.96.121.22錛屽垯URL閮ㄥ垎杈撳叆鐨勫唴瀹瑰氨鏄?#8220;svn://133.96.121.22” 銆?/p> 鍥涖佸熀鏈搷浣滄祦紼?/strong> 1銆佸彇鍑?check out) 鍙栧嚭鐗堟湰搴撳埌涓涓伐浣滄嫹璐濓細 鏉ュ埌浠繪剰絀虹洰褰曚笅錛屾瘮濡傚湪f鍒嗗尯寤虹珛涓涓┖鏂囦歡澶?f:\work 銆?#8220;鍙抽敭 -> SVN Checkout”銆傚湪“URL of repository”涓緭鍏?#8220;svn://localhost/svn/repos1/guestbook”錛岃繖鏍鋒垜浠氨寰楀埌浜嗕竴浠?guestbook 涓唴瀹圭殑宸ヤ綔鎷瘋礉銆?/p> 2銆佸瓨鍏?check in)/鎻愪氦(commit) 鍦ㄥ伐浣滄嫹璐濅腑浣滃嚭淇敼騫舵彁浜わ細 鍦?guestbook 宸ヤ綔鎷瘋礉涓殢渚挎墦寮涓涓枃浠訛紝浣滃嚭淇敼錛岀劧鍚?#8220;鍙抽敭 -> SVN Commit... ”銆傝繖鏍鋒垜浠氨鎶婁慨鏀規彁浜ゅ埌浜嗙増鏈簱錛岀増鏈簱鏍規嵁鎯呭喌瀛樺偍鎴戜滑鎻愪氦鐨勬暟鎹?/p> 鍦ㄤ慨鏀硅繃鐨勬枃浠朵笂“鍙抽敭 -> TortoiseSVN -> Show Log” 錛屽彲浠ョ湅鍒板榪欎釜鏂囦歡鎵鏈夌殑鎻愪氦銆傚湪涓嶅悓鐨?revision 鏉$洰涓?#8220;鍙抽敭 -> Compare with working copy”錛屾垜浠彲浠ユ瘮杈冨伐浣滄嫹璐濈殑鏂囦歡鍜屾墍閫?revision 鐗堟湰鐨勫尯鍒?/p>
# harry = harryssecret
# sally = sallyssecret
銆銆#harry = harryssecret
銆銆#sally = sallyssecret
銆銆test = test
cd existing_git_repo 聽
git remote add origin git@github.com:your_account/your_project.git 聽
git push -u origin master
涓婇潰鐨勪唬鐮佸皢鏈湴鐨勪粨搴撹繛鎺ュ埌榪滅▼浠撳簱錛屽茍涓斿皢浠g爜鎻愪氦鍒癿aster鍒嗘敮涓娿?/span>
====================================================================
絎洓姝ワ細鎻愪氦浠g爜
鏂板緩鐨勬枃浠訛紝XCode浼氭彁紺轟竴涓狝鏍囩錛岃〃紺烘槸added鐨勩?/span>
緙栬緫鐨勬枃浠訛紝XCode浼氭彁紺轟竴涓狹鏍囩錛岃〃紺烘槸Modified鐨勩?/span>
閫変腑瑕佹洿鏂扮殑鏂囦歡錛屽彸閿?->Source Control-->Commit Selected Files 閫氳繃姝ゆ搷浣滃皢鍙樻洿鎻愪氦鍒版湰鍦扮殑浠撳簱涓?/span>
閫変腑瑕佹洿鏂扮殑鏂囦歡錛孎ile鑿滃崟-->Source Control-->Push 灝嗘湰鍦板彉鍖栧瓨鍌ㄥ埌榪滅▼鏈嶅姟鍣ㄤ腑銆?/span>
from錛?span style="text-decoration: underline;">http://qiufangzhou.blog.163.com/blog/static/506421802011924102515390/
鍦↙inux涓嬶紝甯哥敤 grep鍒楀嚭錛堟枃浠跺唴瀹癸級鍚湁鏌愪釜瀛楃涓茬殑鏂囦歡銆?br /> find鍛戒護鏌ユ壘鍖歸厤緇欏畾錛堟枃浠跺悕錛夌殑鏂囦歡銆?br />grep鐢ㄦ硶錛?nbsp;grep [options] PATTERN [FILE]
渚嬪瓙錛?br /> grep "main" * -R//鏌ユ壘褰撳墠鐩綍涓嬬殑鎵鏈夋枃浠躲佺洰褰曚腑鍖呭惈“main”瀛楁牱鐨勬枃浠?br />find鐢ㄦ硶錛?nbsp;find [-H] [-L] [-P] [path] [expression]
渚嬪瓙錛?br /> find /work/driver/net -name "*fb*"//鏌ユ壘/work/drivers/net鐩綍涓嬪悕瀛椾腑鍖呭惈fb鐨勬枃浠?/span>
鍘嬬緝瑙e帇緙╁父鐢ㄧ殑涓ょ鏂瑰紡錛歡zip銆乥zip2
涓鑸岃█錛?#8220;.gz”銆?#8220;z”緇撳熬鐨勬枃浠舵槸gzip鏂瑰紡鍘嬬緝鐨勶紱
“.bz2”緇撳熬鐨勬枃浠舵槸浠zip2鏂瑰紡榪涜鍘嬬緝鐨勶紱
鍚庣紑涓湁tar瀛楁牱鏃惰〃紺鴻繖鏄竴涓枃浠跺寘錛?br />tar鐨?涓父鐢ㄩ夐」:1.c 鍒涘緩錛岀敤鏉ョ敓鎴愭枃浠跺寘2.x 鎻愬彇錛屼粠鏂囦歡鍖呬腑鎻愬彇鏂囦歡3.z 浣跨敤gzip鏂瑰紡榪涜澶勭悊錛堝帇緙┿佽В鍘嬬緝錛?/blockquote>4.j 浣跨敤bzip2鏂瑰紡榪涜澶勭悊錛堝帇緙┿佽В鍘嬬緝錛?/blockquote>5.f 琛ㄧず鏂囦歡錛屽悗闈㈡帴鐫涓涓枃浠跺悕
]]>