]]>
瑙ｅ喅鐗堟湰鍐茬獊鐨勫懡浠ゃ傚湪鍐茬獊瑙ｅ喅涔嬪悗錛岄渶瑕佷嬌鐢?/span>svn resolved鏉ュ憡璇?/span>subversion鍐茬獊瑙ｅ喅錛岃繖鏍鋒墠鑳芥彁浜ゆ洿鏂般傚啿紿佸彂鐢熸椂錛?/span>subversion浼氬湪Work Copy涓繚瀛樻墍鏈夌殑鐩爣鏂囦歡鐗堟湰錛堜笂嬈℃洿鏂扮増鏈佸綋鍓嶈幏鍙栫殑鐗堟湰錛屽嵆鍒漢鎻愪氦鐨勭増鏈佽嚜宸辨洿鏂扮殑鐗堟湰銆佺洰鏍囨枃浠躲傚亣璁炬枃浠跺悕鏄?/span>sandwich.txt錛屽搴旂殑鏂囦歡鍚嶅垎鍒槸錛?/span>sandwich.txt.r1銆?/span>sandwich.txt.r2銆?/span>sandwich.txt.mine銆?/span>sandwich.txt錛夈傚悓鏃跺湪鐩爣鏂囦歡涓爣璁版潵鑷笉鍚岀敤鎴風殑鏇存敼銆?/span>
瑙ｅ喅鍐茬獊鐨勫姙娉曪細
- 鎵嬪姩瑙ｅ喅錛氬啿紿佸彂鐢熸椂錛岄氳繃鍜屽叾浠栫敤鎴鋒矡閫氫箣鍚庯紝鎵嬪姩鏇存柊鐩爣鏂囦歡銆傜劧鍚庢墽琛?/span>svn resolved filename鏉ヨВ闄ゅ啿紿侊紝鏈鍚庢彁浜ゃ?/span>
- 鏀懼純鑷繁鐨勬洿鏂幫紝浣跨敤鍒漢鐨勬洿鏂般備嬌鐢ㄦ渶鏂拌幏鍙栫殑鐗堟湰瑕嗙洊鐩爣鏂囦歡錛屾墽琛?/span>svn resolved filename騫舵彁浜ゃ?/span>
- 鏀懼純鑷繁鐨勬洿鏂幫紝浣跨敤svn revert錛岀劧鍚庢彁浜ゃ傚湪榪欑鏂瑰紡涓嬩笉闇瑕佷嬌鐢?/span>svn resolved銆?/span>
瀵逛簬svn resolved鍛戒護闇瑕侀潪甯稿皬蹇冿紝蹇呴』鏄潪甯哥‘瀹氬啿紿佸凡緇忚В鍐蟲墠鑳戒嬌鐢ㄣ傚惁鍒欙紝浼氬鑷?/span>Subversion浠ヤ負鍐茬獊瑙ｅ喅錛岃屼嬌浠ｇ爜搴撲笉姝ｇ‘銆?/span> 鎴戜滑鍙互浣跨敤svn status -u鏉ラ嫻嬪啿紿侊紝褰撲綘榪愯svn update涓浜涙湁瓚ｇ殑浜嬫儏鍙戠敓浜嗭細 浣嗘槸 褰撳啿紿佸彂鐢熶簡錛屾湁涓変歡浜嬪彲浠ュ府鍔╀綘娉ㄦ剰鍒拌繖縐嶆儏鍐靛拰瑙ｅ喅闂錛?/p>
Subversion鎵撳嵃 濡傛灉Subversion璁や負榪欎釜鏂囦歡鏄彲鍚堝茍鐨勶紝瀹冧細緗叆鍐茬獊鏍囪鈥旂壒孌婄殑妯嚎鍒嗗紑鍐茬獊鐨?#8220;涓ら潰”鈥斿湪鏂囦歡閲屽彲瑙嗗寲鐨勬弿榪伴噸鍙犵殑閮ㄥ垎錛圫ubversion浣跨敤 瀵逛簬姣忎竴涓啿紿佺殑鏂囦歡錛孲ubversion鏀劇疆涓変釜棰濆鐨勬湭鐗堟湰鍖栨枃浠跺埌浣犵殑宸ヤ綔鎷瘋礉錛?/p>
浣犳洿鏂板墠鐨勬枃浠訛紝娌℃湁鍐茬獊鏍囧織錛屽彧鏄綘鏈鏂版洿鏀圭殑鍐呭銆傦紙濡傛灉Subversion璁や負榪欎釜鏂囦歡涓嶅彲浠ュ悎騫訛紝 榪欐槸浣犵殑鍋氭洿鏂版搷浣滀互鍓嶇殑 榪欐槸浣犵殑Subversion瀹㈡埛绔粠鏈嶅姟鍣ㄥ垰鍒氭敹鍒扮殑鐗堟湰錛岃繖涓枃浠跺搴旂増鏈簱鐨?code class=literal>HEAD鐗堟湰銆?/p>
榪欓噷 涓句竴涓緥瀛愶紝Sally淇敼浜?code class=filename>sandwich.txt錛孒arry鍒氬垰鏀瑰彉浜嗕粬鐨勬湰鍦版嫹璐濅腑鐨勮繖涓枃浠跺茍涓旀彁浜ゅ埌鏈嶅姟鍣紝Sally鍦ㄦ彁浜や箣鍓嶆洿鏂板畠鐨勫伐浣滄嫹璐濆緱鍒頒簡鍐茬獊錛?/p>
鍦ㄨ繖縐嶆儏鍐典笅錛孲ubversion涓?/em>浼氬厑璁鎬綘鎻愪氦 濡傛灉浣犻亣鍒板啿紿侊紝涓変歡浜嬩綘鍙互閫夋嫨錛?/p>
“鎵嬪姩”鍚堝茍鍐茬獊鏂囨湰錛堟鏌ュ拰淇敼鏂囦歡涓殑鍐茬獊鏍囧織錛夈?/p>
鐢ㄦ煇涓涓復鏃舵枃浠惰鐩栦綘鐨勫伐浣滄枃浠躲?/p>
榪愯svn revert <filename>鏉ユ斁寮冩墍鏈夌殑淇敼銆?/p>
涓鏃︿綘瑙ｅ喅浜嗗啿紿侊紝浣犻渶瑕侀氳繃鍛戒護svn resolved璁㏒ubversion鐭ラ亾錛岃繖鏍峰氨浼氬垹闄や笁涓復鏃舵枃浠訛紝Subversion灝變笉浼氳涓鴻繖涓枃浠舵槸鍦ㄥ啿紿佺姸鎬佷簡銆?sup>[5] 絎竴嬈″皾璇曡В鍐沖啿紿佽浜烘劅瑙夊緢瀹蟲曪紝浣嗙粡榪囦竴鐐硅緇冿紝瀹冪畝鍗曠殑鍍忔槸楠戠潃杞﹀瓙涓嬪潯銆?/p>
榪欓噷涓涓畝鍗曠殑渚嬪瓙錛岀敱浜庝笉鑹殑浜ゆ祦錛屼綘鍜屽悓浜婼ally錛屽悓鏃剁紪杈戜簡 灝忎簬鍙楓佺瓑浜庡彿鍜屽ぇ浜庡彿涓叉槸鍐茬獊鏍囪錛屽茍涓嶆槸鍐茬獊鐨勬暟鎹紝浣犱竴瀹氳紜畾榪欎簺鍐呭鍦ㄤ笅嬈℃彁浜や箣鍓嶅緱鍒板垹闄わ紝鍓嶄袱緇勬爣蹇椾腑闂寸殑鍐呭鏄綘鍦ㄥ啿紿佸尯鎵鍋氱殑淇敼錛?/p>
鍚庝袱緇勪箣闂寸殑鏄疭ally鎻愪氦鐨勪慨鏀瑰啿紿侊細 閫氬父浣犲茍涓嶅笇鏈涘彧鏄垹闄ゅ啿紿佹爣蹇楀拰Sally鐨勪慨鏀光斿綋濂規敹鍒頒笁鏄庢不鏃訛紝浼氶潪甯哥殑鍚冩儕銆傛墍浠ヤ綘搴旇璧板埌濂圭殑鍔炲叕瀹ゆ垨鏄嬁璧風數璇濆憡璇塖ally錛屼綘娌″姙娉曚粠浠庢剰澶у埄鐔熼搴楀緱鍒版兂瑕佺殑娉¤彍銆?sup>[6]涓鏃︿綘浠‘璁や簡鎻愪氦鍐呭鍚庯紝淇敼鏂囦歡騫朵笖鍒犻櫎鍐茬獊鏍囧織銆?/p>
鐜板湪榪愯svn resolved錛屼綘宸茬粡鍑嗗濂芥彁浜や簡錛?/p>
璁頒綇錛屽鏋滀綘淇敼鍐茬獊鏃舵劅鍒版販涔憋紝浣犲彲浠ュ弬鑰僺ubversion鐢熸垚鐨勪笁涓枃浠垛斿寘鎷綘鏈綔鏇存柊鐨勬枃浠躲備綘涔熷彲浠ヤ嬌鐢ㄧ涓夋柟鐨勫悎騫跺伐鍏鋒楠岃繖涓変釜鏂囦歡銆?/p>
濡傛灉浣犲彧鏄笇鏈涘彇娑堜綘鐨勪慨鏀癸紝浣犲彲浠ヤ粎浠呮嫹璐漇ubversion涓轟綘鐢熸垚鐨勬枃浠舵浛鎹綘鐨勫伐浣滄嫹璐濓細 濡傛灉浣犲緱鍒板啿紿侊紝緇忚繃媯鏌ヤ綘鍐沖畾鍙栨秷鑷繁鐨勪慨鏀瑰茍涓旈噸鏂扮紪杈戯紝浣犲彲浠ユ仮澶嶄綘鐨勪慨鏀癸細 娉ㄦ剰錛屽綋浣犳仮澶嶄竴涓啿紿佺殑鏂囦歡鏃訛紝涓嶉渶瑕佸啀榪愯svn resolved銆?/p>
鐜板湪鎴戜滑鍑嗗濂芥彁浜や慨鏀逛簡錛屾敞鎰?span>svn resolved涓嶅儚鎴戜滑鏈珷瀛﹁繃鐨勫叾浠栧懡浠や竴鏍烽渶瑕佸弬鏁幫紝鍦ㄤ換浣曚綘璁や負瑙ｅ喅浜嗗啿紿佺殑鏃跺欙紝鍙渶瑕佸皬蹇冭繍琛?span>svn resolved錛屸斾竴鏃﹀垹闄や簡涓存椂鏂囦歡錛孲ubversion浼氳浣犳彁浜よ繖鏂囦歡錛屽嵆浣挎枃浠朵腑榪樺瓨鍦ㄥ啿紿佹爣璁般?/p>
鏈鍚庯紒浣犵殑淇敼緇撴潫浜嗭紝浣犲悎騫朵簡鏈嶅姟鍣ㄤ笂鎵鏈夌殑淇敼錛屼綘鍑嗗濂芥彁浜や慨鏀瑰埌鐗堟湰搴撱?/p>
svn commit鍛戒護鍙戦佹墍鏈夌殑淇敼鍒扮増鏈簱錛屽綋浣犳彁浜や慨鏀規椂錛屼綘闇瑕佹彁渚涗竴浜涙弿榪頒慨鏀圭殑鏃ュ織淇℃伅錛屼綘鐨勪俊鎭細闄勫埌榪欎釜淇鐗堟湰涓婏紝濡傛灉淇℃伅寰堢畝鐭紝浣犲彲浠ュ湪鍛戒護琛屼腑浣跨敤 鐒惰岋紝濡傛灉浣犳妸鍐欐棩蹇椾俊鎭綋浣滃伐浣滅殑涓閮ㄥ垎錛屼綘涔熻浼氬笇鏈涢氳繃鍛婅瘔Subversion涓涓枃浠跺悕寰楀埌鏃ュ織淇℃伅錛屼嬌鐢?code class=option>--file閫夐」錛?/p>
濡傛灉浣犳病鏈夋寚瀹?code class=option>--message鎴栬?code class=option>--file閫夐」錛孲ubversion浼氳嚜鍔ㄥ湴鍚姩浣犳渶鍠滄鐨勭紪杈戝櫒錛堣“config”涓鑺?/font>鐨?code class=literal>editor-cmd閮ㄥ垎錛夋潵緙栬緫鏃ュ織淇℃伅銆?/p>
濡傛灉浣犱嬌鐢ㄧ紪杈戝櫒鎾板啓鏃ュ織淇℃伅鏃跺笇鏈涘彇娑堟彁浜わ紝浣犲彲浠ョ洿鎺ュ叧鎺夌紪杈戝櫒錛屼笉瑕佷繚瀛橈紝濡傛灉浣犲凡緇忓仛榪囦繚瀛橈紝鍙綆鍗曠殑鍒犳帀鎵鏈夌殑鏂囨湰騫跺啀嬈′繚瀛樸?/p>
鐗堟湰搴撲笉鐭ラ亾涔熶笉鍏沖績浣犵殑淇敼浣滀負涓涓暣浣撴槸鍚︽湁鎰忎箟錛屽畠鍙鏌ユ槸鍚︽湁鍏朵粬浜轟慨鏀逛簡鍚屼竴涓枃浠訛紝濡傛灉鍒漢宸茬粡榪欐牱鍋氫簡錛屼綘鐨勬暣涓彁浜や細澶辮觸錛屽茍涓旀彁紺轟綘涓涓垨澶氫釜鏂囦歡宸茬粡榪囨椂浜嗭細 姝ゅ埢錛屼綘闇瑕佽繍琛?span>svn update鏉ュ鐞嗘墍鏈夌殑鍚堝茍鍜屽啿紿侊紝鐒跺悗鍐嶅皾璇曟彁浜ゃ?/p>
鎴戜滑宸茬粡瑕嗙洊浜哠ubversion鍩烘湰鐨勫伐浣滃懆鏈燂紝榪樻湁璁稿鍏跺畠鐗規у彲浠ョ鐞嗕綘寰楃増鏈簱鍜屽伐浣滄嫹璐濓紝浣嗘槸鍙嬌鐢ㄥ墠闈粙緇嶇殑鍛戒護浣犲氨鍙互寰堣交鏉劇殑宸ヤ綔浜嗐?/p>
[3] 褰撶劧娌℃湁浠諱綍涓滆タ鏄湪鐗堟湰搴撻噷琚垹闄や簡鈥斿彧鏄湪鐗堟湰搴撶殑 [4] Subversion浣跨敤鍐呯疆鍖哄埆寮曟搸錛岀己鐪佹儏鍐典笅杈撳嚭涓虹粺涓鍖哄埆鏍煎紡銆傚鏋滀綘鏈熸湜涓嶅悓鐨勮緭鍑烘牸寮忥紝浣犲彲浠ヤ嬌鐢?code class=option>--diff-cmd鎸囧畾澶栫疆鐨勫尯鍒▼搴忥紝騫朵笖閫氳繃 [5] 浣犱篃鍙互鎵嬪伐鐨勫垹闄よ繖涓変釜涓存椂鏂囦歡錛屼絾鏄綋Subversion浼氱粰浣犲仛鏃朵綘浼氳嚜宸卞幓鍋氬悧錛熸垜浠槸榪欐牱鎯崇殑銆?/p>
[6] 濡傛灉浣犲悜浠栦滑璇㈤棶錛屼粬浠潪甯告湁鐞嗙敱鎶婁綘甯﹀埌鍩庡鐨勯搧杞ㄤ笂銆?/p>
瑙ｅ喅鍐茬獊璇︾粏鏂囨。: http://svnbook.subversion.org.cn/1.2/svn.tour.cycle.html#svn.tour.cycle.resolve$ svn update
U INSTALL
G README
C bar.c
Updated to revision 46.
U鍜?code class=computeroutput>G娌″繀瑕佸叧蹇冿紝鏂囦歡騫插噣鐨勬帴鍙椾簡鐗堟湰搴撶殑鍙樺寲錛屾枃浠舵爣紺轟負U琛ㄦ槑鏈湴娌℃湁淇敼錛屾枃浠跺凡緇忔牴鎹増鏈簱鏇存柊銆?code class=computeroutput>G鏍囩ず鍚堝茍錛屾爣紺烘湰鍦板凡緇忎慨鏀硅繃錛屼笌鐗堟湰搴撴病鏈夐噸榪殑鍦版柟錛屽凡緇忓悎騫躲?/p>
C琛ㄧず鍐茬獊錛岃鏄庢湇鍔″櫒涓婄殑鏀瑰姩鍚屼綘鐨勬敼鍔ㄥ啿紿佷簡錛屼綘闇瑕佽嚜宸辨墜宸ュ幓瑙ｅ喅銆?/p>
C鏍囪錛屽茍涓旀爣璁拌繖涓枃浠跺凡鍐茬獊銆?/p>
svn:mime-type灞炴ф潵鍐沖畾涓涓枃浠舵槸鍚﹀彲浠ヤ嬌鐢ㄤ笂涓嬫枃鐨勶紝浠ヨ涓哄熀紜鍚堝茍錛屾洿澶氫俊鎭彲浠ョ湅“svn:mime-type”涓鑺?/font>錛夈?/p>
filename.mine
.mine鏂囦歡涓嶄細鍒涘緩錛屽洜涓哄畠鍜屽伐浣滄枃浠剁浉鍚屻傦級filename.rOLDREV
BASE鐗堟湰鏂囦歡錛屽氨鏄綘鍦ㄤ笂嬈℃洿鏂頒箣鍚庢湭浣滄洿鏀圭殑鐗堟湰銆?/p>
filename.rNEWREV
OLDREV鏄綘鐨?code class=filename>.svn鐩綍涓殑淇鐗堟湰鍙鳳紝NEWREV鏄増鏈簱涓?code class=literal>HEAD鐨勭増鏈彿銆?/p>
$ svn update
C sandwich.txt
Updated to revision 2.
$ ls -1
sandwich.txt
sandwich.txt.mine
sandwich.txt.r1
sandwich.txt.r2
sandwich.txt錛岀洿鍒頒綘鐨勪笁涓復鏃舵枃浠惰鍒犳帀銆?/p>
$ svn commit --message "Add a few more things"
svn: Commit failed (details follow):
svn: Aborting commit: '/home/sally/svn-work/sandwich.txt' remains in conflict
$ svn resolved sandwich.txt
Resolved conflicted state of 'sandwich.txt'
sandwich.txt銆係ally鎻愪氦浜嗕慨鏀癸紝褰撲綘鍑嗗鏇存柊浣犵殑鐗堟湰錛屽啿紿佸彂鐢熶簡錛屾垜浠笉寰椾笉鍘諱慨鏀?code class=filename>sandwich.txt鏉ヨВ鍐寵繖涓棶棰樸傞鍏堬紝鐪嬩竴涓嬭繖涓枃浠訛細$ cat sandwich.txt
Top piece of bread
Mayonnaise
Lettuce
Tomato
Provolone
<<<<<<< .mine
Salami
Mortadella
Prosciutto
=======
Sauerkraut
Grilled Chicken
>>>>>>> .r2
Creole Mustard
Bottom piece of bread
<<<<<<< .mine
Salami
Mortadella
Prosciutto
=======
=======
Sauerkraut
Grilled Chicken
>>>>>>> .r2
Top piece of bread
Mayonnaise
Lettuce
Tomato
Provolone
Salami
Mortadella
Prosciutto
Creole Mustard
Bottom piece of bread
$ svn resolved sandwich.txt
$ svn commit -m "Go ahead and use my sandwich, discarding Sally's edits."
$ svn update
C sandwich.txt
Updated to revision 2.
$ ls sandwich.*
sandwich.txt sandwich.txt.mine sandwich.txt.r2 sandwich.txt.r1
$ cp sandwich.txt.r2 sandwich.txt
$ svn resolved sandwich.txt
$ svn revert sandwich.txt
Reverted 'sandwich.txt'
$ ls sandwich.*
sandwich.txt
--message錛?code class=option>-m錛夐夐」錛?/p>
$ svn commit --message "Corrected number of cheese slices."
Sending sandwich.txt
Transmitting file data .
Committed revision 3.
$ svn commit --file logmsg
Sending sandwich.txt
Transmitting file data .
Committed revision 4.
鎻愮ず
$ svn commit
Waiting for Emacs...Done
Log message unchanged or not specified
a)bort, c)ontinue, e)dit
a
$
$ svn commit --message "Add another rule"
Sending rules.txt
svn: Commit failed (details follow):
svn: Out of date: 'rules.txt' in transaction 'g'
HEAD閲屾秷澶變簡錛屼綘鍙互閫氳繃媯鍑猴紙鎴栬呮洿鏂頒綘鐨勫伐浣滄嫹璐濓級浣犲仛鍑哄垹闄ゆ搷浣滅殑鍓嶄竴涓慨璁㈢増鏈潵鎵懼洖鎵鏈夌殑涓滆タ銆?/p>
--extensions浼犻掑叾浠栧弬鏁幫紝涓句釜渚嬪瓙錛屽療鐪嬫湰鍦版枃浠?code class=filename>foo.c鐨勫尯鍒紝鍚屾椂蹇界暐絀烘牸淇敼錛屼綘鍙互榪愯svn diff --diff-cmd /usr/bin/diff --extensions '-bc' foo.c銆?/p>
- 褰撳伐浣滃畬鎴愪箣鍚庯紙鍗崇紪鍐欏畬紼嬪簭錛屽崟鍏冩祴璇曢氳繃錛夊敖蹇殑鎻愪氦錛岄綣佺殑鎻愪氦/鏇存柊鍙互闄嶄綆鍦ㄥ啿紿佸彂鐢熺殑姒傜巼錛屼互鍙婂彂鐢熸椂瑙ｅ喅鍐茬獊鐨勫鏉傚害銆?/span>
- 濡傛灉鍐茬獊棰戠箒鍙戠敓錛屽氨鏈夊繀瑕佹壘鍑哄師鍥犱簡銆?/span>
- 鍦ㄦ彁浜ゆ椂錛屼功鍐欐槑紜殑message銆傛柟渚夸互鍚庣殑鏌ユ壘鏇存柊鐨勫師鍥狅紝姣曠珶闅忕潃鏃跺厜嫻侀濓紝璁板繂涔熶細鍙樺緱妯＄硦銆?/span>
]]>
]]>