锘??xml version="1.0" encoding="utf-8" standalone="yes"?><rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:trackback="http://madskills.com/public/xml/rss/module/trackback/" xmlns:wfw="http://wellformedweb.org/CommentAPI/" xmlns:slash="http://purl.org/rss/1.0/modules/slash/"><channel><title>&#20037;&#20037;&#26080;&#30721;&#20154;&#22971;&#19968;&#21306;&#20108;&#21306;&#19977;&#21306;&#44;&#22825;&#22530;&#26080;&#30721;&#20037;&#20037;&#32508;&#21512;&#19996;&#20140;&#28909;&#44;&#20037;&#20037;&#20122;&#27954;&#22269;&#20135;&#31934;&#21697;&#49;&#50;&#51;&#21306;</title><link>http://www.shnenglu.com/alantop/archive/2007/09/11/32005.html</link><dc:creator>AlanTop</dc:creator><author>AlanTop</author><pubDate>Tue, 11 Sep 2007 05:44:00 GMT</pubDate><guid>http://www.shnenglu.com/alantop/archive/2007/09/11/32005.html</guid><wfw:comment>http://www.shnenglu.com/alantop/comments/32005.html</wfw:comment><comments>http://www.shnenglu.com/alantop/archive/2007/09/11/32005.html#Feedback</comments><slash:comments>0</slash:comments><wfw:commentRss>http://www.shnenglu.com/alantop/comments/commentRss/32005.html</wfw:commentRss><trackback:ping>http://www.shnenglu.com/alantop/services/trackbacks/32005.html</trackback:ping><description><![CDATA[&nbsp;&nbsp;&nbsp;&nbsp; 鎽樿: tortoisemerge浣跨敤鎵嬪唽&nbsp;&nbsp;<a href='http://www.shnenglu.com/alantop/archive/2007/09/11/32005.html'>闃呰鍏ㄦ枃</a><img src ="http://www.shnenglu.com/alantop/aggbug/32005.html" width = "1" height = "1" /><br><br><div align=right><a style="text-decoration:none;" href="http://www.shnenglu.com/alantop/" target="_blank">AlanTop</a> 2007-09-11 13:44 <a href="http://www.shnenglu.com/alantop/archive/2007/09/11/32005.html#Feedback" target="_blank" style="text-decoration:none;">鍙戣〃璇勮</a></div>]]></description></item><item><title>subversion鍐茬獊瑙ｅ喅鍜寃inmerge浣跨敤鎵嬪唽</title><link>http://www.shnenglu.com/alantop/archive/2007/09/09/31871.html</link><dc:creator>AlanTop</dc:creator><author>AlanTop</author><pubDate>Sun, 09 Sep 2007 01:32:00 GMT</pubDate><guid>http://www.shnenglu.com/alantop/archive/2007/09/09/31871.html</guid><wfw:comment>http://www.shnenglu.com/alantop/comments/31871.html</wfw:comment><comments>http://www.shnenglu.com/alantop/archive/2007/09/09/31871.html#Feedback</comments><slash:comments>0</slash:comments><wfw:commentRss>http://www.shnenglu.com/alantop/comments/commentRss/31871.html</wfw:commentRss><trackback:ping>http://www.shnenglu.com/alantop/services/trackbacks/31871.html</trackback:ping><description><![CDATA[winmerge浣跨敤鎵嬪唽 <br><a >http://winmerge.org/2.6/manual/index.html</a><br><br>
<p><font size=2><span>瑙ｅ喅鐗堟湰鍐茬獊鐨勫懡浠ゃ�傚湪鍐茬獊瑙ｅ喅涔嬪悗錛岄渶瑕佷嬌鐢?/span><span><font face="Times New Roman">svn resolved</font></span><span>鏉ュ憡璇?/span><span><font face="Times New Roman">subversion</font></span><span>鍐茬獊瑙ｅ喅錛岃繖鏍鋒墠鑳芥彁浜ゆ洿鏂般�傚啿紿佸彂鐢熸椂錛?/span><span><font face="Times New Roman">subversion</font></span><span>浼氬湪</span><span><font face="Times New Roman">Work Copy</font></span><span>涓繚瀛樻墍鏈夌殑鐩爣鏂囦歡鐗堟湰錛堜笂嬈℃洿鏂扮増鏈�佸綋鍓嶈幏鍙栫殑鐗堟湰錛屽嵆鍒漢鎻愪氦鐨勭増鏈�佽嚜宸辨洿鏂扮殑鐗堟湰銆佺洰鏍囨枃浠躲�傚亣璁炬枃浠跺悕鏄?/span><span><font face="Times New Roman">sandwich.txt</font></span><span>錛屽搴旂殑鏂囦歡鍚嶅垎鍒槸錛?/span><span><font face="Times New Roman">sandwich.txt.r1</font></span><span>銆?/span><span><font face="Times New Roman">sandwich.txt.r2</font></span><span>銆?/span><span><font face="Times New Roman">sandwich.txt.mine</font></span><span>銆?/span><span><font face="Times New Roman">sandwich.txt</font></span><span>錛夈�傚悓鏃跺湪鐩爣鏂囦歡涓爣璁版潵鑷笉鍚岀敤鎴風殑鏇存敼銆?/span></font></p>
<p><span><font size=2>瑙ｅ喅鍐茬獊鐨勫姙娉曪細</font></span></p>
<p><font size=2><span><span><font face="Times New Roman">-<span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></font></span></span><span>鎵嬪姩瑙ｅ喅錛氬啿紿佸彂鐢熸椂錛岄�氳繃鍜屽叾浠栫敤鎴鋒矡閫氫箣鍚庯紝鎵嬪姩鏇存柊鐩爣鏂囦歡銆傜劧鍚庢墽琛?/span><span><font face="Times New Roman">svn resolved filename</font></span><span>鏉ヨВ闄ゅ啿紿侊紝鏈�鍚庢彁浜ゃ�?/span></font></p>
<p><font size=2><span><span><font face="Times New Roman">-<span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></font></span></span><span>鏀懼純鑷繁鐨勬洿鏂幫紝浣跨敤鍒漢鐨勬洿鏂般�備嬌鐢ㄦ渶鏂拌幏鍙栫殑鐗堟湰瑕嗙洊鐩爣鏂囦歡錛屾墽琛?/span><span><font face="Times New Roman">svn resolved filename</font></span><span>騫舵彁浜ゃ�?/span></font></p>
<p><font size=2><span><span><font face="Times New Roman">-<span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></font></span></span><span>鏀懼純鑷繁鐨勬洿鏂幫紝浣跨敤</span><span><font face="Times New Roman">svn revert</font></span><span>錛岀劧鍚庢彁浜ゃ�傚湪榪欑鏂瑰紡涓嬩笉闇�瑕佷嬌鐢?/span><span><font face="Times New Roman">svn resolved</font></span><span>銆?/span></font></p>
<p><font size=2><strong><span>瀵逛簬</span><span><font face="Times New Roman">svn resolved</font></span></strong><strong><span>鍛戒護闇�瑕侀潪甯稿皬蹇冿紝蹇呴』鏄潪甯哥‘瀹氬啿紿佸凡緇忚В鍐蟲墠鑳戒嬌鐢ㄣ�傚惁鍒欙紝浼氬鑷?/span><span><font face="Times New Roman">Subversion</font></span></strong><strong><span>浠ヤ負鍐茬獊瑙ｅ喅錛岃�屼嬌浠ｇ爜搴撲笉姝ｇ‘銆?/span><span> <br>
<p><br>瑙ｅ喅鍐茬獊璇︾粏鏂囨。: <a >http://svnbook.subversion.org.cn/1.2/svn.tour.cycle.html#svn.tour.cycle.resolve</a><br><br></p>
<div>
<div>
<h3 class=title><a id=svn.tour.cycle.resolve>瑙ｅ喅鍐茬獊錛堝悎騫跺埆浜虹殑淇敼錛?/h3>
</div>
</div>
<div></div>
<p>鎴戜滑鍙互浣跨敤<span><strong class=command>svn status -u</strong></span>鏉ラ嫻嬪啿紿侊紝褰撲綘榪愯<span><strong class=command>svn update</strong></span>涓�浜涙湁瓚ｇ殑浜嬫儏鍙戠敓浜嗭細</p>
<pre class=screen>$ svn update
U  INSTALL
G  README
C  bar.c
Updated to revision 46.
</pre>
<p><code class=computeroutput>U</code>鍜?code class=computeroutput>G</code>娌″繀瑕佸叧蹇冿紝鏂囦歡騫插噣鐨勬帴鍙椾簡鐗堟湰搴撶殑鍙樺寲錛屾枃浠舵爣紺轟負<code class=computeroutput>U</code>琛ㄦ槑鏈湴娌℃湁淇敼錛屾枃浠跺凡緇忔牴鎹増鏈簱鏇存柊銆?code class=computeroutput>G</code>鏍囩ず鍚堝茍錛屾爣紺烘湰鍦板凡緇忎慨鏀硅繃錛屼笌鐗堟湰搴撴病鏈夐噸榪殑鍦版柟錛屽凡緇忓悎騫躲�?/p>
<p>浣嗘槸<code class=computeroutput>C</code>琛ㄧず鍐茬獊錛岃鏄庢湇鍔″櫒涓婄殑鏀瑰姩鍚屼綘鐨勬敼鍔ㄥ啿紿佷簡錛屼綘闇�瑕佽嚜宸辨墜宸ュ幓瑙ｅ喅銆?/p>
<p>褰撳啿紿佸彂鐢熶簡錛屾湁涓変歡浜嬪彲浠ュ府鍔╀綘娉ㄦ剰鍒拌繖縐嶆儏鍐靛拰瑙ｅ喅闂錛?/p>
<div   id="lvjhvrj"   class=itemizedlist>
<ul type=disc>
    <li>
    <p>Subversion鎵撳嵃<code class=computeroutput>C</code>鏍囪錛屽茍涓旀爣璁拌繖涓枃浠跺凡鍐茬獊銆?/p>
    <li>
    <p>濡傛灉Subversion璁や負榪欎釜鏂囦歡鏄彲鍚堝茍鐨勶紝瀹冧細緗叆<em class=firstterm>鍐茬獊鏍囪</em>鈥旂壒孌婄殑妯嚎鍒嗗紑鍐茬獊鐨?#8220;<span id="jnvzllt"    class=quote>涓ら潰</span>&#8221;鈥斿湪鏂囦歡閲屽彲瑙嗗寲鐨勬弿榪伴噸鍙犵殑閮ㄥ垎錛圫ubversion浣跨敤<code class=literal>svn:mime-type</code>灞炴�ф潵鍐沖畾涓�涓枃浠舵槸鍚﹀彲浠ヤ嬌鐢ㄤ笂涓嬫枃鐨勶紝浠ヨ涓哄熀紜�鍚堝茍錛屾洿澶氫俊鎭彲浠ョ湅<a title=svn:mime-type ><u><font color=#0000ff>&#8220;<code class=literal>svn:mime-type</code>&#8221;涓�鑺?/font></u></a>錛夈�?/p>
    <li>
    <p>瀵逛簬姣忎竴涓啿紿佺殑鏂囦歡錛孲ubversion鏀劇疆涓変釜棰濆鐨勬湭鐗堟湰鍖栨枃浠跺埌浣犵殑宸ヤ綔鎷瘋礉錛?/p>
    <div   id="bztdhhd"   class=variablelist>
    <dl>
    <dt><span id="ddxrljz"    class=term><code class=filename>filename.mine</code></span>
    <dd>
    <p>浣犳洿鏂板墠鐨勬枃浠訛紝娌℃湁鍐茬獊鏍囧織錛屽彧鏄綘鏈�鏂版洿鏀圭殑鍐呭銆傦紙濡傛灉Subversion璁や負榪欎釜鏂囦歡涓嶅彲浠ュ悎騫訛紝<code class=filename>.mine</code>鏂囦歡涓嶄細鍒涘緩錛屽洜涓哄畠鍜屽伐浣滄枃浠剁浉鍚屻�傦級</p>
    <dt><span id="vbvfpnv"    class=term><code class=filename>filename.rOLDREV</code></span>
    <dd>
    <p>榪欐槸浣犵殑鍋氭洿鏂版搷浣滀互鍓嶇殑<code class=literal>BASE</code>鐗堟湰鏂囦歡錛屽氨鏄綘鍦ㄤ笂嬈℃洿鏂頒箣鍚庢湭浣滄洿鏀圭殑鐗堟湰銆?/p>
    <dt><span id="vdnrbrr"    class=term><code class=filename>filename.rNEWREV</code></span>
    <dd>
    <p>榪欐槸浣犵殑Subversion瀹㈡埛绔粠鏈嶅姟鍣ㄥ垰鍒氭敹鍒扮殑鐗堟湰錛岃繖涓枃浠跺搴旂増鏈簱鐨?code class=literal>HEAD</code>鐗堟湰銆?/p>
    </dd></dl></div>
    <p>榪欓噷<code class=literal>OLDREV</code>鏄綘鐨?code class=filename>.svn</code>鐩綍涓殑淇鐗堟湰鍙鳳紝<code class=literal>NEWREV</code>鏄増鏈簱涓?code class=literal>HEAD</code>鐨勭増鏈彿銆?/p>
    </li>
</ul>
</div>
<p>涓句竴涓緥瀛愶紝Sally淇敼浜?code class=filename>sandwich.txt</code>錛孒arry鍒氬垰鏀瑰彉浜嗕粬鐨勬湰鍦版嫹璐濅腑鐨勮繖涓枃浠跺茍涓旀彁浜ゅ埌鏈嶅姟鍣紝Sally鍦ㄦ彁浜や箣鍓嶆洿鏂板畠鐨勫伐浣滄嫹璐濆緱鍒頒簡鍐茬獊錛?/p>
<pre class=screen>$ svn update
C  sandwich.txt
Updated to revision 2.
$ ls -1
sandwich.txt
sandwich.txt.mine
sandwich.txt.r1
sandwich.txt.r2
</pre>
<p>鍦ㄨ繖縐嶆儏鍐典笅錛孲ubversion<span id="fvnrtjj"    class=emphasis><em>涓?/em></span>浼氬厑璁鎬綘鎻愪氦<code class=filename>sandwich.txt</code>錛岀洿鍒頒綘鐨勪笁涓復鏃舵枃浠惰鍒犳帀銆?/p>
<pre class=screen>$ 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
</pre>
<p>濡傛灉浣犻亣鍒板啿紿侊紝涓変歡浜嬩綘鍙互閫夋嫨錛?/p>
<div   id="hnblfxn"   class=itemizedlist>
<ul type=disc>
    <li>
    <p>&#8220;<span id="jfzdvtt"    class=quote>鎵嬪姩</span>&#8221;鍚堝茍鍐茬獊鏂囨湰錛堟鏌ュ拰淇敼鏂囦歡涓殑鍐茬獊鏍囧織錛夈�?/p>
    <li>
    <p>鐢ㄦ煇涓�涓復鏃舵枃浠惰鐩栦綘鐨勫伐浣滄枃浠躲�?/p>
    <li>
    <p>榪愯<span><strong class=command>svn revert &lt;filename&gt;</strong></span>鏉ユ斁寮冩墍鏈夌殑淇敼銆?/p>
    </li>
</ul>
</div>
<p>涓�鏃︿綘瑙ｅ喅浜嗗啿紿侊紝浣犻渶瑕侀�氳繃鍛戒護<span><strong class=command>svn resolved</strong></span>璁㏒ubversion鐭ラ亾錛岃繖鏍峰氨浼氬垹闄や笁涓復鏃舵枃浠訛紝Subversion灝變笉浼氳涓鴻繖涓枃浠舵槸鍦ㄥ啿紿佺姸鎬佷簡銆?sup>[<a id=N10CC6 ><u><font color=#800080>5</font></u></a>]</sup></p>
<pre class=screen>$ svn resolved sandwich.txt
Resolved conflicted state of 'sandwich.txt'
</pre>
<div   id="ndnjhzh"   class=sect3 lang=zh-cn>
<div   id="zxhjvdt"   class=titlepage>
<div>
<div>
<h4 class=title><a id=svn.tour.cycle.resolve.byhand>鎵嬪伐鍚堝茍鍐茬獊</h4>
</div>
</div>
<div></div>
<p>絎竴嬈″皾璇曡В鍐沖啿紿佽浜烘劅瑙夊緢瀹蟲�曪紝浣嗙粡榪囦竴鐐硅緇冿紝瀹冪畝鍗曠殑鍍忔槸楠戠潃杞﹀瓙涓嬪潯銆?/p>
<p>榪欓噷涓�涓畝鍗曠殑渚嬪瓙錛岀敱浜庝笉鑹殑浜ゆ祦錛屼綘鍜屽悓浜婼ally錛屽悓鏃剁紪杈戜簡<code class=filename>sandwich.txt</code>銆係ally鎻愪氦浜嗕慨鏀癸紝褰撲綘鍑嗗鏇存柊浣犵殑鐗堟湰錛屽啿紿佸彂鐢熶簡錛屾垜浠笉寰椾笉鍘諱慨鏀?code class=filename>sandwich.txt</code>鏉ヨВ鍐寵繖涓棶棰樸�傞鍏堬紝鐪嬩竴涓嬭繖涓枃浠訛細</p>
<pre class=screen>$ cat sandwich.txt
Top piece of bread
Mayonnaise
Lettuce
Tomato
Provolone
&lt;&lt;&lt;&lt;&lt;&lt;&lt; .mine
Salami
Mortadella
Prosciutto
=======
Sauerkraut
Grilled Chicken
&gt;&gt;&gt;&gt;&gt;&gt;&gt; .r2
Creole Mustard
Bottom piece of bread
</pre>
<p>灝忎簬鍙楓�佺瓑浜庡彿鍜屽ぇ浜庡彿涓叉槸鍐茬獊鏍囪錛屽茍涓嶆槸鍐茬獊鐨勬暟鎹紝浣犱竴瀹氳紜畾榪欎簺鍐呭鍦ㄤ笅嬈℃彁浜や箣鍓嶅緱鍒板垹闄わ紝鍓嶄袱緇勬爣蹇椾腑闂寸殑鍐呭鏄綘鍦ㄥ啿紿佸尯鎵�鍋氱殑淇敼錛?/p>
<pre class=screen>&lt;&lt;&lt;&lt;&lt;&lt;&lt; .mine
Salami
Mortadella
Prosciutto
=======
</pre>
<p>鍚庝袱緇勪箣闂寸殑鏄疭ally鎻愪氦鐨勪慨鏀瑰啿紿侊細</p>
<pre class=screen>=======
Sauerkraut
Grilled Chicken
&gt;&gt;&gt;&gt;&gt;&gt;&gt; .r2
</pre>
<p>閫氬父浣犲茍涓嶅笇鏈涘彧鏄垹闄ゅ啿紿佹爣蹇楀拰Sally鐨勪慨鏀光�斿綋濂規(guī)敹鍒頒笁鏄庢不鏃訛紝浼氶潪甯哥殑鍚冩儕銆傛墍浠ヤ綘搴旇璧板埌濂圭殑鍔炲叕瀹ゆ垨鏄嬁璧風數(shù)璇濆憡璇塖ally錛屼綘娌″姙娉曚粠浠庢剰澶у埄鐔熼搴楀緱鍒版兂瑕佺殑娉¤彍銆?sup>[<a id=N10CE7 ><u><font color=#800080>6</font></u></a>]</sup>涓�鏃︿綘浠‘璁や簡鎻愪氦鍐呭鍚庯紝淇敼鏂囦歡騫朵笖鍒犻櫎鍐茬獊鏍囧織銆?/p>
<pre class=screen>Top piece of bread
Mayonnaise
Lettuce
Tomato
Provolone
Salami
Mortadella
Prosciutto
Creole Mustard
Bottom piece of bread
</pre>
<p>鐜板湪榪愯<span><strong class=command>svn resolved</strong></span>錛屼綘宸茬粡鍑嗗濂芥彁浜や簡錛?/p>
<pre class=screen>$ svn resolved sandwich.txt
$ svn commit -m "Go ahead and use my sandwich, discarding Sally's edits."
</pre>
<p>璁頒綇錛屽鏋滀綘淇敼鍐茬獊鏃舵劅鍒版販涔憋紝浣犲彲浠ュ弬鑰僺ubversion鐢熸垚鐨勪笁涓枃浠垛�斿寘鎷綘鏈綔鏇存柊鐨勬枃浠躲�備綘涔熷彲浠ヤ嬌鐢ㄧ涓夋柟鐨勫悎騫跺伐鍏鋒楠岃繖涓変釜鏂囦歡銆?/p>
</div>
<div   id="rptfpxv"   class=sect3 lang=zh-cn>
<div   id="tjdfhpx"   class=titlepage>
<div>
<div>
<h4 class=title><a id=svn.tour.cycle.resolve.copyover>鎷瘋礉瑕嗙洊浣犵殑宸ヤ綔鏂囦歡</h4>
</div>
</div>
<div></div>
<p>濡傛灉浣犲彧鏄笇鏈涘彇娑堜綘鐨勪慨鏀癸紝浣犲彲浠ヤ粎浠呮嫹璐漇ubversion涓轟綘鐢熸垚鐨勬枃浠舵浛鎹綘鐨勫伐浣滄嫹璐濓細</p>
<pre class=screen>$ 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
</pre>
</div>
<div   id="ljlprhx"   class=sect3 lang=zh-cn>
<div   id="nlxzdlb"   class=titlepage>
<div>
<div>
<h4 class=title><a id=svn.tour.cycle.resolve.revert>涓嬫敞錛氫嬌鐢?span><strong class=command>svn revert</strong></span></h4>
</div>
</div>
<div></div>
<p>濡傛灉浣犲緱鍒板啿紿侊紝緇忚繃媯�鏌ヤ綘鍐沖畾鍙栨秷鑷繁鐨勪慨鏀瑰茍涓旈噸鏂扮紪杈戯紝浣犲彲浠ユ仮澶嶄綘鐨勪慨鏀癸細</p>
<pre class=screen>$ svn revert sandwich.txt
Reverted 'sandwich.txt'
$ ls sandwich.*
sandwich.txt
</pre>
<p>娉ㄦ剰錛屽綋浣犳仮澶嶄竴涓啿紿佺殑鏂囦歡鏃訛紝涓嶉渶瑕佸啀榪愯<span><strong class=command>svn resolved</strong></span>銆?/p>
</div>
<p>鐜板湪鎴戜滑鍑嗗濂芥彁浜や慨鏀逛簡錛屾敞鎰?span><strong class=command>svn resolved</strong></span>涓嶅儚鎴戜滑鏈珷瀛﹁繃鐨勫叾浠栧懡浠や竴鏍烽渶瑕佸弬鏁幫紝鍦ㄤ換浣曚綘璁や負瑙ｅ喅浜嗗啿紿佺殑鏃跺�欙紝鍙渶瑕佸皬蹇冭繍琛?span><strong class=command>svn resolved</strong></span>錛屸�斾竴鏃﹀垹闄や簡涓存椂鏂囦歡錛孲ubversion浼氳浣犳彁浜よ繖鏂囦歡錛屽嵆浣挎枃浠朵腑榪樺瓨鍦ㄥ啿紿佹爣璁般�?/p>
</div>
<div   id="xlnhdrj"   class=sect2 lang=zh-cn>
<div   id="trlhzph"   class=titlepage>
<div>
<div>
<h3 class=title><a id=svn.tour.cycle.commit>鎻愪氦浣犲緱淇敼</h3>
</div>
</div>
<div></div>
<p>鏈�鍚庯紒浣犵殑淇敼緇撴潫浜嗭紝浣犲悎騫朵簡鏈嶅姟鍣ㄤ笂鎵�鏈夌殑淇敼錛屼綘鍑嗗濂芥彁浜や慨鏀瑰埌鐗堟湰搴撱�?/p>
<p><span><strong class=command>svn commit</strong></span>鍛戒護鍙戦�佹墍鏈夌殑淇敼鍒扮増鏈簱錛屽綋浣犳彁浜や慨鏀規(guī)椂錛屼綘闇�瑕佹彁渚涗竴浜涙弿榪頒慨鏀圭殑<em class=firstterm>鏃ュ織淇℃伅</em>錛屼綘鐨勪俊鎭細闄勫埌榪欎釜淇鐗堟湰涓婏紝濡傛灉淇℃伅寰堢畝鐭紝浣犲彲浠ュ湪鍛戒護琛屼腑浣跨敤<code class=option>--message</code>錛?code class=option>-m</code>錛夐�夐」錛?/p>
<pre class=screen>$ svn commit --message "Corrected number of cheese slices."
Sending        sandwich.txt
Transmitting file data .
Committed revision 3.
</pre>
<p>鐒惰�岋紝濡傛灉浣犳妸鍐欐棩蹇椾俊鎭綋浣滃伐浣滅殑涓�閮ㄥ垎錛屼綘涔熻浼氬笇鏈涢�氳繃鍛婅瘔Subversion涓�涓枃浠跺悕寰楀埌鏃ュ織淇℃伅錛屼嬌鐢?code class=option>--file</code>閫夐」錛?/p>
<pre class=screen>$ svn commit --file logmsg
Sending        sandwich.txt
Transmitting file data .
Committed revision 4.
</pre>
<p>濡傛灉浣犳病鏈夋寚瀹?code class=option>--message</code>鎴栬�?code class=option>--file</code>閫夐」錛孲ubversion浼氳嚜鍔ㄥ湴鍚姩浣犳渶鍠滄鐨勭紪杈戝櫒錛堣<a title=config ><u><font color=#0000ff>&#8220;config&#8221;涓�鑺?/font></u></a>鐨?code class=literal>editor-cmd</code>閮ㄥ垎錛夋潵緙栬緫鏃ュ織淇℃伅銆?/p>
<div   id="jplnrxv"   class=tip style="MARGIN-LEFT: 0.5in; MARGIN-RIGHT: 0.5in">
<h3 class=title>鎻愮ず</h3>
<p>濡傛灉浣犱嬌鐢ㄧ紪杈戝櫒鎾板啓鏃ュ織淇℃伅鏃跺笇鏈涘彇娑堟彁浜わ紝浣犲彲浠ョ洿鎺ュ叧鎺夌紪杈戝櫒錛屼笉瑕佷繚瀛橈紝濡傛灉浣犲凡緇忓仛榪囦繚瀛橈紝鍙綆�鍗曠殑鍒犳帀鎵�鏈夌殑鏂囨湰騫跺啀嬈′繚瀛樸�?/p>
<pre class=screen>$ svn commit
Waiting for Emacs...Done
Log message unchanged or not specified
a)bort, c)ontinue, e)dit
a
$
</pre>
</div>
<p>鐗堟湰搴撲笉鐭ラ亾涔熶笉鍏沖績浣犵殑淇敼浣滀負涓�涓暣浣撴槸鍚︽湁鎰忎箟錛屽畠鍙鏌ユ槸鍚︽湁鍏朵粬浜轟慨鏀逛簡鍚屼竴涓枃浠訛紝濡傛灉鍒漢<span id="rzjfhhn"    class=emphasis><em>宸茬粡</em></span>榪欐牱鍋氫簡錛屼綘鐨勬暣涓彁浜や細澶辮觸錛屽茍涓旀彁紺轟綘涓�涓垨澶氫釜鏂囦歡宸茬粡榪囨椂浜嗭細</p>
<pre class=screen>$ svn commit --message "Add another rule"
Sending        rules.txt
svn: Commit failed (details follow):
svn: Out of date: 'rules.txt' in transaction 'g'
</pre>
<p>姝ゅ埢錛屼綘闇�瑕佽繍琛?span><strong class=command>svn update</strong></span>鏉ュ鐞嗘墍鏈夌殑鍚堝茍鍜屽啿紿侊紝鐒跺悗鍐嶅皾璇曟彁浜ゃ�?/p>
<p>鎴戜滑宸茬粡瑕嗙洊浜哠ubversion鍩烘湰鐨勫伐浣滃懆鏈燂紝榪樻湁璁稿鍏跺畠鐗規(guī)�у彲浠ョ鐞嗕綘寰楃増鏈簱鍜屽伐浣滄嫹璐濓紝浣嗘槸鍙嬌鐢ㄥ墠闈粙緇嶇殑鍛戒護浣犲氨鍙互寰堣交鏉劇殑宸ヤ綔浜嗐�?/p>
</div>
<div   id="nbdhjzr"   class=footnotes><br>
<hr align=left width=100>
<div   id="ltfhlrz"   class=footnote>
<p><sup>[<a id=ftn.N1095D ><u><font color=#800080>3</font></u></a>] </sup>褰撶劧娌℃湁浠諱綍涓滆タ鏄湪鐗堟湰搴撻噷琚垹闄や簡鈥斿彧鏄湪鐗堟湰搴撶殑<code class=literal>HEAD</code>閲屾秷澶變簡錛屼綘鍙互閫氳繃媯�鍑猴紙鎴栬�呮洿鏂頒綘鐨勫伐浣滄嫹璐濓級浣犲仛鍑哄垹闄ゆ搷浣滅殑鍓嶄竴涓慨璁㈢増鏈潵鎵懼洖鎵�鏈夌殑涓滆タ銆?/p>
</div>
<div   id="xfhjndt"   class=footnote>
<p><sup>[<a id=ftn.N10B85 ><u><font color=#800080>4</font></u></a>] </sup>Subversion浣跨敤鍐呯疆鍖哄埆寮曟搸錛岀己鐪佹儏鍐典笅杈撳嚭涓虹粺涓�鍖哄埆鏍煎紡銆傚鏋滀綘鏈熸湜涓嶅悓鐨勮緭鍑烘牸寮忥紝浣犲彲浠ヤ嬌鐢?code class=option>--diff-cmd</code>鎸囧畾澶栫疆鐨勫尯鍒▼搴忥紝騫朵笖閫氳繃<code class=option>--extensions</code>浼犻�掑叾浠栧弬鏁幫紝涓句釜渚嬪瓙錛屽療鐪嬫湰鍦版枃浠?code class=filename>foo.c</code>鐨勫尯鍒紝鍚屾椂蹇界暐絀烘牸淇敼錛屼綘鍙互榪愯<span><strong class=command>svn diff --diff-cmd /usr/bin/diff --extensions '-bc' foo.c</strong></span>銆?/p>
</div>
<div   id="pdhbltr"   class=footnote>
<p><sup>[<a id=ftn.N10CC6 ><u><font color=#800080>5</font></u></a>] </sup>浣犱篃鍙互鎵嬪伐鐨勫垹闄よ繖涓変釜涓存椂鏂囦歡錛屼絾鏄綋Subversion浼氱粰浣犲仛鏃朵綘浼氳嚜宸卞幓鍋氬悧錛熸垜浠槸榪欐牱鎯崇殑銆?/p>
</div>
<div   id="ftfzdrp"   class=footnote>
<p><sup>[<a id=ftn.N10CE7 ><u><font color=#800080>6</font></u></a>] </sup>濡傛灉浣犲悜浠栦滑璇㈤棶錛屼粬浠潪甯告湁鐞嗙敱鎶婁綘甯﹀埌鍩庡鐨勯搧杞ㄤ笂銆?/p>
</div>
</div>
</div>
</div>
</div>
<p><br><br><br></p>
</span></strong></font>濡備綍闄嶄綆鍐茬獊瑙ｅ喅鐨勫鏉傚害:<br>
<p><font size=2><span><span><font face="Times New Roman">-<span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></font></span></span><span>褰撳伐浣滃畬鎴愪箣鍚庯紙鍗崇紪鍐欏畬紼嬪簭錛屽崟鍏冩祴璇曢�氳繃錛夊敖蹇殑鎻愪氦錛岄綣佺殑鎻愪氦</span><span><font face="Times New Roman">/</font></span><span>鏇存柊鍙互闄嶄綆鍦ㄥ啿紿佸彂鐢熺殑姒傜巼錛屼互鍙婂彂鐢熸椂瑙ｅ喅鍐茬獊鐨勫鏉傚害銆?/span></font></p>
<p><font size=2><span><span><font face="Times New Roman">-<span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></font></span></span><span>濡傛灉鍐茬獊棰戠箒鍙戠敓錛屽氨鏈夊繀瑕佹壘鍑哄師鍥犱簡銆?/span></font></p>
<p><font size=2><span><span><font face="Times New Roman">-<span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></font></span></span><span>鍦ㄦ彁浜ゆ椂錛屼功鍐欐槑紜殑</span><span><font face="Times New Roman">message</font></span><span>銆傛柟渚夸互鍚庣殑鏌ユ壘鏇存柊鐨勫師鍥狅紝姣曠珶闅忕潃鏃跺厜嫻侀�濓紝璁板繂涔熶細鍙樺緱妯＄硦銆?/span></font></p>
<br>
<img src ="http://www.shnenglu.com/alantop/aggbug/31871.html" width = "1" height = "1" /><br><br><div align=right><a style="text-decoration:none;" href="http://www.shnenglu.com/alantop/" target="_blank">AlanTop</a> 2007-09-09 09:32 <a href="http://www.shnenglu.com/alantop/archive/2007/09/09/31871.html#Feedback" target="_blank" style="text-decoration:none;">鍙戣〃璇勮</a></div>]]></description></item><item><title>subversion鏈嶅姟鍣ㄧ殑閰嶇疆</title><link>http://www.shnenglu.com/alantop/archive/2007/07/12/27891.html</link><dc:creator>AlanTop</dc:creator><author>AlanTop</author><pubDate>Thu, 12 Jul 2007 03:02:00 GMT</pubDate><guid>http://www.shnenglu.com/alantop/archive/2007/07/12/27891.html</guid><wfw:comment>http://www.shnenglu.com/alantop/comments/27891.html</wfw:comment><comments>http://www.shnenglu.com/alantop/archive/2007/07/12/27891.html#Feedback</comments><slash:comments>1</slash:comments><wfw:commentRss>http://www.shnenglu.com/alantop/comments/commentRss/27891.html</wfw:commentRss><trackback:ping>http://www.shnenglu.com/alantop/services/trackbacks/27891.html</trackback:ping><description><![CDATA[&nbsp;&nbsp;&nbsp;&nbsp; 鎽樿: subversion鏈嶅姟鍣ㄧ殑閰嶇疆&nbsp;&nbsp;<a href='http://www.shnenglu.com/alantop/archive/2007/07/12/27891.html'>闃呰鍏ㄦ枃</a><img src ="http://www.shnenglu.com/alantop/aggbug/27891.html" width = "1" height = "1" /><br><br><div align=right><a style="text-decoration:none;" href="http://www.shnenglu.com/alantop/" target="_blank">AlanTop</a> 2007-07-12 11:02 <a href="http://www.shnenglu.com/alantop/archive/2007/07/12/27891.html#Feedback" target="_blank" style="text-decoration:none;">鍙戣〃璇勮</a></div>]]></description></item></channel></rss>                                                                                    <footer>
<div class="friendship-link">
<p>感谢您访问我们的网站，您可能还对以下资源感兴趣：</p>
<a href="http://www.shnenglu.com/" title="&#31934;&#21697;&#35270;&#39057;&#20037;&#20037;&#20037;&#20037;">&#31934;&#21697;&#35270;&#39057;&#20037;&#20037;&#20037;&#20037;</a>

<div class="friend-links">


</div>
</div>

</footer>

<a href="http://www.antispy.cn" target="_blank">久久国产成人精品国产成人亚洲</a>|
<a href="http://www.ohos33.cn" target="_blank">久久精品国产亚洲AV影院</a>|
<a href="http://www.pic789.cn" target="_blank">人妻精品久久久久中文字幕一冢本</a>|
<a href="http://www.moneychange.cn" target="_blank">久久久久久久精品妇女99
</a>|
<a href="http://www.sanbaotong.cn" target="_blank">狠狠色丁香婷婷久久综合五月</a>|
<a href="http://www.hzf89.cn" target="_blank">99久久综合国产精品免费</a>|
<a href="http://www.pophyh.cn" target="_blank">人妻久久久一区二区三区</a>|
<a href="http://www.beauty-queen.cn" target="_blank">亚洲国产精品久久久久婷婷软件
</a>|
<a href="http://www.zfrnhbv.com.cn" target="_blank">精品久久久久中文字幕日本</a>|
<a href="http://www.taobaoluntan.net.cn" target="_blank">久久九九精品99国产精品</a>|
<a href="http://www.jingxi.jx.cn" target="_blank">亚洲国产成人久久综合碰碰动漫3d
</a>|
<a href="http://www.reeway.cn" target="_blank">97r久久精品国产99国产精</a>|
<a href="http://www.zsputian.com.cn" target="_blank">久久91这里精品国产2020</a>|
<a href="http://www.400bxg.cn" target="_blank">少妇人妻88久久中文字幕</a>|
<a href="http://www.zmlxs.cn" target="_blank">韩国三级中文字幕hd久久精品</a>|
<a href="http://www.chengrenshop.com.cn" target="_blank">久久久久久久91精品免费观看</a>|
<a href="http://www.huizegufen.cn" target="_blank">91视频国产91久久久</a>|
<a href="http://www.x3077.cn" target="_blank">少妇无套内谢久久久久</a>|
<a href="http://www.kkmd0.cn" target="_blank">青青草原综合久久</a>|
<a href="http://www.qinyoyo.cn" target="_blank">亚洲AV乱码久久精品蜜桃</a>|
<a href="http://www.allevery.cn" target="_blank">欧美午夜A∨大片久久
</a>|
<a href="http://www.hzmgdj.com.cn" target="_blank">久久精品青青草原伊人</a>|
<a href="http://www.wwmw.com.cn" target="_blank">久久综合丁香激情久久</a>|
<a href="http://www.jrlxcc.cn" target="_blank">人妻精品久久无码专区精东影业</a>|
<a href="http://www.akq33.cn" target="_blank">色婷婷噜噜久久国产精品12p</a>|
<a href="http://www.kapatina.cn" target="_blank">国产精品久久久久jk制服</a>|
<a href="http://www.520chuanqi.cn" target="_blank">国产偷久久久精品专区</a>|
<a href="http://www.lq03.cn" target="_blank">色青青草原桃花久久综合</a>|
<a href="http://www.magifts.cn" target="_blank">国产激情久久久久影院老熟女免费</a>|
<a href="http://www.haoking.cn" target="_blank">亚洲精品蜜桃久久久久久</a>|
<a href="http://www.zjzlgs.cn" target="_blank">一级做a爰片久久毛片毛片</a>|
<a href="http://www.gocq8.cn" target="_blank">天堂无码久久综合东京热</a>|
<a href="http://www.ywxcj.cn" target="_blank">国产精品一区二区久久精品无码</a>|
<a href="http://www.yc9z.com.cn" target="_blank">2021久久国自产拍精品</a>|
<a href="http://www.0771008.cn" target="_blank">国产精品无码久久久久久</a>|
<a href="http://www.yhkim.cn" target="_blank">国内精品久久久久影院一蜜桃</a>|
<a href="http://www.icaew.com.cn" target="_blank">午夜欧美精品久久久久久久</a>|
<a href="http://www.shuangfengjixie.com.cn" target="_blank">久久天天婷婷五月俺也去</a>|
<a href="http://www.ffcchh.com.cn" target="_blank">午夜精品久久久久久影视riav</a>|
<a href="http://www.52shadu.cn" target="_blank">中文精品99久久国产</a>|
<a href="http://www.arqing.cn" target="_blank">久久天天躁狠狠躁夜夜不卡</a>|
<script>
(function(){
    var bp = document.createElement('script');
    var curProtocol = window.location.protocol.split(':')[0];
    if (curProtocol === 'https') {
        bp.src = 'https://zz.bdstatic.com/linksubmit/push.js';
    }
    else {
        bp.src = 'http://push.zhanzhang.baidu.com/push.js';
    }
    var s = document.getElementsByTagName("script")[0];
    s.parentNode.insertBefore(bp, s);
})();
</script>
</body>