�??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>&#20122;&#27954;&#39640;&#28165;&#22269;&#20135;&#31934;&#21697;&#44;&#20061;&#20061;&#28909;&#32447;&#35270;&#39057;&#21482;&#26377;&#36825;&#37324;&#26368;&#31934;&#21697;&#44;&#22269;&#20135;&#31995;&#21015;&#22312;&#32447;&#35266;&#30475;</title><link>http://www.aygfsteel.com/paulwong/category/54327.html</link><description /><language>zh-cn</language><lastBuildDate>Sat, 27 Dec 2014 09:30:12 GMT</lastBuildDate><pubDate>Sat, 27 Dec 2014 09:30:12 GMT</pubDate><ttl>60</ttl><item><title>Eclipse下svn的创建分�?合�ƈ/切换使用</title><link>http://www.aygfsteel.com/paulwong/archive/2014/12/26/421845.html</link><dc:creator>paulwong</dc:creator><author>paulwong</author><pubDate>Fri, 26 Dec 2014 05:19:00 GMT</pubDate><guid>http://www.aygfsteel.com/paulwong/archive/2014/12/26/421845.html</guid><wfw:comment>http://www.aygfsteel.com/paulwong/comments/421845.html</wfw:comment><comments>http://www.aygfsteel.com/paulwong/archive/2014/12/26/421845.html#Feedback</comments><slash:comments>0</slash:comments><wfw:commentRss>http://www.aygfsteel.com/paulwong/comments/commentRss/421845.html</wfw:commentRss><trackback:ping>http://www.aygfsteel.com/paulwong/services/trackbacks/421845.html</trackback:ping><description><![CDATA[<p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 15.75pt; background-color: #ffffff;"><span style="font-size: 10.5pt; font-family: Helvetica, sans-serif;">&nbsp; &nbsp; &nbsp; &nbsp;</span><span style="font-size: 10.5pt;">最�q�接��目要求�Q�要�?/span><span style="font-size: 10.5pt; font-family: Helvetica, sans-serif;">svn</span><span style="font-size: 10.5pt;">��d��上创建分支，用分支来�q�行�E�序�?/span><span style="font-size: 10.5pt; font-family: Helvetica, sans-serif;">bug</span><span style="font-size: 10.5pt;">修改�Q�而主�q�上�q�行新功能的开发。分支上�?/span><span style="font-size: 10.5pt; font-family: Helvetica, sans-serif;">bug</span><span style="font-size: 10.5pt;">修改完，发布后，可以合�ƈ��C���q�上。项目程序可以在��d��和分支之间进行切换，来实��C���q�和分支的同时维护�?/span></p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 15.75pt; background-color: #ffffff;"><span style="font-size: 10.5pt; font-family: Helvetica, sans-serif;">&nbsp; &nbsp; &nbsp;&nbsp;<strong>&nbsp;1.</strong></span><strong>创徏分支</strong></p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 15.75pt; background-color: #ffffff;">&nbsp; &nbsp; &nbsp; &nbsp;&nbsp;创徏分支实际上就是将�E�序copy一份到指定的分支目录，如下囄����Q?/p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 15.75pt; background-color: #ffffff;"><img src="http://dl2.iteye.com/upload/attachment/0087/4118/29f85cd7-8eff-3fbc-afff-78e1ed816aee.png" alt="" style="border: 0px;" /><br /><br />在项目名�U�C��点击右键�Q�弹�����单，选择&#8220;Team&#8221;�Q�再选择&#8220;Branch/Tag&#8221;�Q�弹��Z��面的��面�Q?nbsp;</p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 15.75pt; background-color: #ffffff;"><br /><img src="http://dl2.iteye.com/upload/attachment/0087/4122/e1596e5d-fb77-3277-b2b9-326f3c6c753b.png" alt="" style="border: 0px;" /><br />&nbsp;</p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 15.75pt; background-color: #ffffff;"><span style="font-size: 10.5pt;">上图中的&#8220;</span><span style="font-size: 10.5pt; font-family: Helvetica, sans-serif;">Copy to URL</span><span style="font-size: 10.5pt;">&#8221;填写创徏新分支的路径地址�Q�后面会���程�?/span><span style="font-size: 10.5pt; font-family: Helvetica, sans-serif;">copy</span><span style="font-size: 10.5pt;">到该目录下，形成新的分支。点�?#8220;</span><span style="font-size: 10.5pt; font-family: Helvetica, sans-serif;">Next</span><span style="font-size: 10.5pt;">&#8221;</span><span style="font-size: 10.5pt; font-family: Helvetica, sans-serif;">:</span></p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 15.75pt; background-color: #ffffff;"><span style="font-size: 10.5pt;">&nbsp;<br /><img src="http://dl2.iteye.com/upload/attachment/0087/4124/d699d825-ae47-32e7-ab7f-e47478ab26fb.png" alt="" style="border: 0px;" /><br />&nbsp;</span></p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 15.75pt; background-color: #ffffff;"><span style="font-size: 10.5pt;">选择当前最新的版本�Q�点�?#8220;</span><span style="font-size: 10.5pt; font-family: Helvetica, sans-serif;">Next</span><span style="font-size: 10.5pt;">&#8221;</span></p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 15.75pt; background-color: #ffffff;"><br /><img src="http://dl2.iteye.com/upload/attachment/0087/4127/a5e0df97-6bdd-3cba-af60-463e6834716d.png" alt="" style="border: 0px;" /><br />&nbsp;</p><p style="margin: 15.6pt 0px 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 25.2000007629395px; text-indent: 21pt; background-color: #ffffff;"><span style="font-size: 10.5pt;">如果��N��了上图下面�?/span><span style="font-size: 10.5pt; font-family: Helvetica, sans-serif;">switch working copy to new branch/tag</span><span style="font-size: 10.5pt;">�Q?/span><span style="font-size: 10.5pt; font-family: Helvetica, sans-serif;">eclipse</span><span style="font-size: 10.5pt;">的程序项目会自动切换到分支下。这里我们不选择�Q�待会自己切�?/span>�?/p><p style="margin: 15.6pt 0px 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 25.2000007629395px; text-indent: 24pt; background-color: #ffffff;">�q�样���创��Z��一�?.0的分�?/p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 25.2000007629395px; background-color: #ffffff;"><strong>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 2.</strong><strong><span style="font-family: 宋体;">合�ƈ</span></strong></p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 25.2000007629395px; background-color: #ffffff;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="font-family: 宋体;">可以从主�q�合�q�到分支�Q�也可以从分支合�q�到��d���Q�根据需要可以选择合适的选项�Q�如下图�Q?/span></p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 25.2000007629395px; background-color: #ffffff;"><br /><img src="http://dl2.iteye.com/upload/attachment/0087/4129/fda9e4e2-c7c1-3ee5-929e-e3b4baa1e054.png" alt="" style="border: 0px;" /><br />&nbsp;</p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 25.2000007629395px; background-color: #ffffff;"><span style="font-family: 宋体;">上图中的选项�Q?/span></p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 25.2000007629395px; background-color: #ffffff;">&nbsp; &nbsp; &nbsp; &nbsp; 1<span style="font-family: 宋体;"><span style="font-family: Helvetica, Tahoma, Arial, sans-serif;">)</span>&nbsp;从主�q�合�q�到分支</span></p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 25.2000007629395px; background-color: #ffffff;"><span style="line-height: 1.5;">&nbsp; &nbsp; &nbsp; &nbsp;</span>&nbsp;2)&nbsp;<span style="font-family: 宋体;">从分支合�q�到��d��</span></p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 25.2000007629395px; background-color: #ffffff;"><span style="line-height: 1.5;">&nbsp; &nbsp; &nbsp; &nbsp;</span>&nbsp;3)&nbsp;<span style="font-family: 宋体;">���主�q�上的修改合�q�到分支</span></p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 25.2000007629395px; background-color: #ffffff;"><span style="line-height: 1.5;">&nbsp; &nbsp; &nbsp; &nbsp;</span>&nbsp;4)&nbsp;合�ƈ2个分支到��d��</p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 25.2000007629395px; background-color: #ffffff;"><span style="line-height: 1.5;">&nbsp; &nbsp; &nbsp; &nbsp;</span>&nbsp;5)&nbsp;从主�q�到分支�Q�手工指定不需要合�q�的修改</p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 25.2000007629395px; background-color: #ffffff;"><span style="line-height: 1.5;">&nbsp; &nbsp; &nbsp; &nbsp;</span>&nbsp;6)&nbsp;从主�q�到分支�Q�手工指定要合�ƈ的修�?/p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 25.2000007629395px; background-color: #ffffff;"><br /><img src="http://dl2.iteye.com/upload/attachment/0087/4131/1ca0fcfa-2088-349e-af0c-81fba70022af.png" alt="" style="border: 0px;" /><br />&nbsp;</p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 25.2000007629395px; background-color: #ffffff;"><span style="font-family: 宋体;">上图昄���没有��M��修改�Q�所以不用进行合�q��?/span></p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 25.2000007629395px; background-color: #ffffff;">&nbsp;</p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 25.2000007629395px; background-color: #ffffff;"><strong>3.</strong><strong><span style="font-family: 宋体;">切换</span></strong></p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 25.2000007629395px; background-color: #ffffff;"><span style="font-family: 宋体;">在项目名�U�C��点击右键�Q�选择&#8220;</span>Team<span style="font-family: 宋体;">&#8221;</span>&nbsp;&#8211;&gt;&nbsp;<span style="font-family: 宋体;">&#8220;</span>switch to another Branch/Tag/Revision<span style="font-family: 宋体;">&#8221;�?/span></p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 25.2000007629395px; background-color: #ffffff;"><br /><img src="http://dl2.iteye.com/upload/attachment/0087/4133/fe753eba-7571-3b6e-abdd-dec8294e6c53.png" alt="" style="border: 0px;" /><br />&nbsp;</p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 25.2000007629395px; background-color: #ffffff;"><span style="font-family: 宋体;">选择需要切换的目的地址�Q�点�?/span>ok<span style="font-family: 宋体;">卛_���?/span></p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 25.2000007629395px; background-color: #ffffff;">&nbsp;</p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 25.2000007629395px; background-color: #ffffff;"><span style="font-family: 宋体;">�q�样�Q�在��目里就可以在主�q�和若干分支间进行�Q意切换，来实现对不同版本</span>/<span style="font-family: 宋体;">分支的程序进行修�Ҏ��交操作�?/span></p><img src ="http://www.aygfsteel.com/paulwong/aggbug/421845.html" width = "1" height = "1" /><br><br><div align=right><a style="text-decoration:none;" href="http://www.aygfsteel.com/paulwong/" target="_blank">paulwong</a> 2014-12-26 13:19 <a href="http://www.aygfsteel.com/paulwong/archive/2014/12/26/421845.html#Feedback" target="_blank" style="text-decoration:none;">发表评论</a></div>]]></description></item><item><title>Eclipse下svn的创建分�?合�ƈ/切换使用</title><link>http://www.aygfsteel.com/paulwong/archive/2014/05/27/414162.html</link><dc:creator>paulwong</dc:creator><author>paulwong</author><pubDate>Tue, 27 May 2014 06:34:00 GMT</pubDate><guid>http://www.aygfsteel.com/paulwong/archive/2014/05/27/414162.html</guid><wfw:comment>http://www.aygfsteel.com/paulwong/comments/414162.html</wfw:comment><comments>http://www.aygfsteel.com/paulwong/archive/2014/05/27/414162.html#Feedback</comments><slash:comments>0</slash:comments><wfw:commentRss>http://www.aygfsteel.com/paulwong/comments/commentRss/414162.html</wfw:commentRss><trackback:ping>http://www.aygfsteel.com/paulwong/services/trackbacks/414162.html</trackback:ping><description><![CDATA[<p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; background-color: #ffffff; line-height: 15.75pt;"><span style="font-size: 10.5pt; font-family: Helvetica, sans-serif;">&nbsp; &nbsp; &nbsp; &nbsp;</span><span style="font-size: 10.5pt;">最�q�接��目要求�Q�要�?/span><span style="font-size: 10.5pt; font-family: Helvetica, sans-serif;">svn</span><span style="font-size: 10.5pt;">��d��上创建分支，用分支来�q�行�E�序�?/span><span style="font-size: 10.5pt; font-family: Helvetica, sans-serif;">bug</span><span style="font-size: 10.5pt;">修改�Q�而主�q�上�q�行新功能的开发。分支上�?/span><span style="font-size: 10.5pt; font-family: Helvetica, sans-serif;">bug</span><span style="font-size: 10.5pt;">修改完，发布后，可以合�ƈ��C���q�上。项目程序可以在��d��和分支之间进行切换，来实��C���q�和分支的同时维护�?/span></p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; background-color: #ffffff; line-height: 15.75pt;"><span style="font-size: 10.5pt; font-family: Helvetica, sans-serif;">&nbsp; &nbsp; &nbsp;&nbsp;<strong>&nbsp;1.</strong></span><strong>创徏分支</strong></p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; background-color: #ffffff; line-height: 15.75pt;">&nbsp; &nbsp; &nbsp; &nbsp;&nbsp;创徏分支实际上就是将�E�序copy一份到指定的分支目录，如下囄����Q?/p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; background-color: #ffffff; line-height: 15.75pt;"><img src="http://dl2.iteye.com/upload/attachment/0087/4118/29f85cd7-8eff-3fbc-afff-78e1ed816aee.png" alt="" style="border: 0px;" /><br /><br />在项目名�U�C��点击右键�Q�弹�����单，选择&#8220;Team&#8221;�Q�再选择&#8220;Branch/Tag&#8221;�Q�弹��Z��面的��面�Q?nbsp;</p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; background-color: #ffffff; line-height: 15.75pt;"><br /><img src="http://dl2.iteye.com/upload/attachment/0087/4122/e1596e5d-fb77-3277-b2b9-326f3c6c753b.png" alt="" style="border: 0px;" /><br />&nbsp;</p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; background-color: #ffffff; line-height: 15.75pt;"><span style="font-size: 10.5pt;">上图中的&#8220;</span><span style="font-size: 10.5pt; font-family: Helvetica, sans-serif;">Copy to URL</span><span style="font-size: 10.5pt;">&#8221;填写创徏新分支的路径地址�Q�后面会���程�?/span><span style="font-size: 10.5pt; font-family: Helvetica, sans-serif;">copy</span><span style="font-size: 10.5pt;">到该目录下，形成新的分支。点�?#8220;</span><span style="font-size: 10.5pt; font-family: Helvetica, sans-serif;">Next</span><span style="font-size: 10.5pt;">&#8221;</span><span style="font-size: 10.5pt; font-family: Helvetica, sans-serif;">:</span></p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; background-color: #ffffff; line-height: 15.75pt;"><span style="font-size: 10.5pt;">&nbsp;<br /><img src="http://dl2.iteye.com/upload/attachment/0087/4124/d699d825-ae47-32e7-ab7f-e47478ab26fb.png" alt="" style="border: 0px;" /><br />&nbsp;</span></p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; background-color: #ffffff; line-height: 15.75pt;"><span style="font-size: 10.5pt;">选择当前最新的版本�Q�点�?#8220;</span><span style="font-size: 10.5pt; font-family: Helvetica, sans-serif;">Next</span><span style="font-size: 10.5pt;">&#8221;</span></p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; background-color: #ffffff; line-height: 15.75pt;"><br /><img src="http://dl2.iteye.com/upload/attachment/0087/4127/a5e0df97-6bdd-3cba-af60-463e6834716d.png" alt="" style="border: 0px;" /><br />&nbsp;</p><p style="margin: 15.6pt 0px 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 25.200000762939453px; background-color: #ffffff; text-indent: 21pt;"><span style="font-size: 10.5pt;">如果��N��了上图下面�?/span><span style="font-size: 10.5pt; font-family: Helvetica, sans-serif;">switch working copy to new branch/tag</span><span style="font-size: 10.5pt;">�Q?/span><span style="font-size: 10.5pt; font-family: Helvetica, sans-serif;">eclipse</span><span style="font-size: 10.5pt;">的程序项目会自动切换到分支下。这里我们不选择�Q�待会自己切�?/span>�?/p><p style="margin: 15.6pt 0px 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 25.200000762939453px; background-color: #ffffff; text-indent: 24pt;">�q�样���创��Z��一�?.0的分�?/p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 25.200000762939453px; background-color: #ffffff;"><strong>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 2.</strong><strong><span style="font-family: 宋体;">合�ƈ</span></strong></p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 25.200000762939453px; background-color: #ffffff;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="font-family: 宋体;">可以从主�q�合�q�到分支�Q�也可以从分支合�q�到��d���Q�根据需要可以选择合适的选项�Q�如下图�Q?/span></p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 25.200000762939453px; background-color: #ffffff;"><br /><img src="http://dl2.iteye.com/upload/attachment/0087/4129/fda9e4e2-c7c1-3ee5-929e-e3b4baa1e054.png" alt="" style="border: 0px;" /><br />&nbsp;</p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 25.200000762939453px; background-color: #ffffff;"><span style="font-family: 宋体;">上图中的选项�Q?/span></p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 25.200000762939453px; background-color: #ffffff;">&nbsp; &nbsp; &nbsp; &nbsp; 1<span style="font-family: 宋体;"><span style="font-family: Helvetica, Tahoma, Arial, sans-serif;">)</span>&nbsp;从主�q�合�q�到分支</span></p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 25.200000762939453px; background-color: #ffffff;"><span style="line-height: 1.5;">&nbsp; &nbsp; &nbsp; &nbsp;</span>&nbsp;2)&nbsp;<span style="font-family: 宋体;">从分支合�q�到��d��</span></p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 25.200000762939453px; background-color: #ffffff;"><span style="line-height: 1.5;">&nbsp; &nbsp; &nbsp; &nbsp;</span>&nbsp;3)&nbsp;<span style="font-family: 宋体;">���主�q�上的修改合�q�到分支</span></p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 25.200000762939453px; background-color: #ffffff;"><span style="line-height: 1.5;">&nbsp; &nbsp; &nbsp; &nbsp;</span>&nbsp;4)&nbsp;合�ƈ2个分支到��d��</p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 25.200000762939453px; background-color: #ffffff;"><span style="line-height: 1.5;">&nbsp; &nbsp; &nbsp; &nbsp;</span>&nbsp;5)&nbsp;从主�q�到分支�Q�手工指定不需要合�q�的修改</p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 25.200000762939453px; background-color: #ffffff;"><span style="line-height: 1.5;">&nbsp; &nbsp; &nbsp; &nbsp;</span>&nbsp;6)&nbsp;从主�q�到分支�Q�手工指定要合�ƈ的修�?/p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 25.200000762939453px; background-color: #ffffff;"><br /><img src="http://dl2.iteye.com/upload/attachment/0087/4131/1ca0fcfa-2088-349e-af0c-81fba70022af.png" alt="" style="border: 0px;" /><br />&nbsp;</p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 25.200000762939453px; background-color: #ffffff;"><span style="font-family: 宋体;">上图昄���没有��M��修改�Q�所以不用进行合�q��?/span></p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 25.200000762939453px; background-color: #ffffff;">&nbsp;</p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 25.200000762939453px; background-color: #ffffff;"><strong>3.</strong><strong><span style="font-family: 宋体;">切换</span></strong></p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 25.200000762939453px; background-color: #ffffff;"><span style="font-family: 宋体;">在项目名�U�C��点击右键�Q�选择&#8220;</span>Team<span style="font-family: 宋体;">&#8221;</span>&nbsp;&#8211;&gt;&nbsp;<span style="font-family: 宋体;">&#8220;</span>switch to another Branch/Tag/Revision<span style="font-family: 宋体;">&#8221;�?/span></p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 25.200000762939453px; background-color: #ffffff;"><br /><img src="http://dl2.iteye.com/upload/attachment/0087/4133/fe753eba-7571-3b6e-abdd-dec8294e6c53.png" alt="" style="border: 0px;" /><br />&nbsp;</p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 25.200000762939453px; background-color: #ffffff;"><span style="font-family: 宋体;">选择需要切换的目的地址�Q�点�?/span>ok<span style="font-family: 宋体;">卛_���?/span></p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 25.200000762939453px; background-color: #ffffff;">&nbsp;</p><p style="margin: 0px; padding: 0px; font-family: Helvetica, Tahoma, Arial, sans-serif; line-height: 25.200000762939453px; background-color: #ffffff;"><span style="font-family: 宋体;">�q�样�Q�在��目里就可以在主�q�和若干分支间进行�Q意切换，来实现对不同版本</span>/<span style="font-family: 宋体;">分支的程序进行修�Ҏ��交操作�?br /><br />参考：<br /></span>Overview of CollabNet Merge Client<span style="font-family: 宋体;"><br /><a  target="_blank">https://desktop-eclipse.open.collab.net/servlets/ProjectProcess?pageID=MEuUjb&amp;freeformpage=Merge%20Client</a><br /><br /></span>eclipse中将SVN分支合�ƈ��C���q�的�Ҏ��<span style="font-family: 宋体;"><br /><a  target="_blank">http://www.darrenfang.com/merge-branches-to-trunk-in-eclipse.html</a><br /></span></p><img src ="http://www.aygfsteel.com/paulwong/aggbug/414162.html" width = "1" height = "1" /><br><br><div align=right><a style="text-decoration:none;" href="http://www.aygfsteel.com/paulwong/" target="_blank">paulwong</a> 2014-05-27 14:34 <a href="http://www.aygfsteel.com/paulwong/archive/2014/05/27/414162.html#Feedback" target="_blank" style="text-decoration:none;">发表评论</a></div>]]></description></item><item><title>SVN中tag branch trunk用法详解</title><link>http://www.aygfsteel.com/paulwong/archive/2014/05/07/413344.html</link><dc:creator>paulwong</dc:creator><author>paulwong</author><pubDate>Tue, 06 May 2014 16:10:00 GMT</pubDate><guid>http://www.aygfsteel.com/paulwong/archive/2014/05/07/413344.html</guid><wfw:comment>http://www.aygfsteel.com/paulwong/comments/413344.html</wfw:comment><comments>http://www.aygfsteel.com/paulwong/archive/2014/05/07/413344.html#Feedback</comments><slash:comments>0</slash:comments><wfw:commentRss>http://www.aygfsteel.com/paulwong/comments/commentRss/413344.html</wfw:commentRss><trackback:ping>http://www.aygfsteel.com/paulwong/services/trackbacks/413344.html</trackback:ping><description><![CDATA[本节主要讲解一下SVN中tag branch trunk的用法，在SVN中Branch/tag在一个功能选项中，在��用中也往往产生��h��。这里就向大家简单介�l�一下，�Ƣ迎大家能和我一起学习SVN中tag branch trunk的用法�?br /><br />在实��C���Q�branch和tag�Q�对于svn都是使用copy实现的，所以他们在默认的权限上和一般的目录没有区别。至于何时用tag�Q�何时用branch�Q�完全由��Z��观的�Ҏ��规范和需要来选择�Q�而不是强制的�Q�比如cvs�Q�。一般情况下�Q�tag�Q�是用来做一个milestone的，不管是不是release�Q�都是一个可用的版本。这里，应该是只�ȝ��。更多的是一个显�C�用的，�l��h一个可读（readable�Q�的标记。branch�Q�是用来做�ƈ行开发的�Q�这里的�q�行是指和trunk�q�行比较。比如，3.0开发完成，�q�个时候要做一个tag�Q�tag_release_3_0�Q�然后基于这个tag做release�Q�比如安装程序等。trunk�q�入3.1的开发，但是3.0发现了bug�Q�那么就需要基于tag_release_3_0做一个branch�Q�branch_bugfix_3_0�Q�基于这个branch�q�行bugfix�Q�等到bugfix�l�束�Q�做一个tag�Q�tag_release_3_0_1�Q�然后，�Ҏ��需要决定branch_bugfix_3_0是否�q�入trunk。对于svn�q�要注意的一点，���是它是全局版本��P��其实�q�个���是一个tag的标讎ͼ�所以我们经常可以看刎ͼ�什么什么release�Q�基于xxx��目�?xxxx版本。就是这个意思了。但是，它还明确的给��Z��个tag的概念，���是因�ؓ�q�个更加的可读，毕竟��C��tag_release_1_0要比��C��一个很大的版本号容易的多�?br /><br />branches�Q�分�?br />SVN中tag branch trunk的用法，首先看一下branches的介�l�。当多个人合作，可能有这��L��情况出现�Q�John�H�然有个��x���Q�跟原先的设计不太一��_��可能是功能的��d��或者日志格式的改进�{�等�Q�总而言之，�q�个��x��可能需要花一�D�|��间来完成�Q�而这个过�E�中�Q�John的一些操作可能会影响Sally的工作，John从现有的状态单独出一个project的话�Q�又不能及时得到Sally对已有代码做的修正，而且独立出来的话�Q�John的尝试成功时�Q�跟原来的合�q�也存在困难。这时最好的实践�Ҏ��是��用branches。John建立一个自��q��branch�Q�然后在里面实验�Q�必要的时候从Sally的trunk里取得更斎ͼ�或者将自己的阶�D�|��果汇集到trunk中�?br />�Q�svncopySourceURL/trunkDestinationURL/branchName-m"Creatingaprivatebranchofxxxx/trunk."�Q?br /><br />trunk�Q�主�q?br />��d���Q�一般来说就是开发的主要呆的地方�Q?br /><br />tag:  图标<br />在经�q�了一�D�|��间的开发后�Q�项目到达了一个里�E�碑阶段�Q�你可能惌���录这一阶段的代码的状态，那么你就需要给代码打上标签�?br />(svncpfile:///svnroot/mojavescripts/trunkfile:///svnroot/mojavescripts/tags/mirrorutils_rel_0_0_1-m"tagedmirrorutils_rel_0_0_1")另有一��_��无所谓谁对谁错�?br /><br />trunk�Q�表�C�开发时版本存放的目录，卛_��开发阶�D늚�代码都提交到该目录上�?br /><br />branches�Q�表�C�发布的版本存放的目录，即项目上�U�时发布的稳定版本存攑֜�该目录中�?br /><br />tags�Q�表�C�标�{�֭�攄���目录�?br /><br />在这需要说明下分三个目录的原因�Q�如果项目分��Z��期、二期、三期等�Q�那么一期上�U�时的稳定版本就应该在一期完成时���代码copy到branches上，�q�样二期开发的代码���对一期的代码没有影响�Q�如新增的模块就不会部��v到生产环境上。而branches上的�E�_��的版本就是发布到生��环境上的代码�Q�如果用户��用的�q�程中发现有bug�Q�则只要在branches上修改该bug�Q�修改完bug后再�~�译branches上最新的代码发布到生产环境即可。tags的作用是���在branches上修改的bug的代码合�q�到trunk上时创徏个版本标识，以后branches上修改的bug代码再合�q�到trunk上时��׃��tags的version到branches最新的version合�ƈ到trunk�Q�以保证前期修改的bug代码不会再合�q��?br /><br />-------------------------------------------------------------------------------------------<br />介绍SVN中tag branch trunk用法�Ӟ��一直以来用svn只是当作cvs�Q�也从来没有仔细看过文档�Q�直��C��天用刎ͼ�才去��ȝ��svnbook文档�Q�惭�?br /><br />需求一�Q?br />有一个客��h��对��品做定制�Q�但是我们�ƈ不想修改原有的svn中trunk的代码�?br />�Ҏ���Q?br />用svn建立一个新的branches�Q�从�q�个branche做�ؓ一个新的�v�Ҏ��开�?br />svncopysvn://server/trunksvn://server/branches/ep-m"initep"<br />Tip:<br />如果你的svn中以前没有branches�q�个的目录，只有trunk�q�个�Q�你可以�?br />svnmkdirbranches新徏个目�?br /><br />需求二�Q?br />产品开发已�l�基本完成，�q�且通过很严格的���试�Q�这时候我们就惛_��布给客户使用�Q�发布我们的1.0版本<br />svncopysvn://server/trunksvn://server/tags/release-1.0-m"1.0released"咦，�q�个和branches有什么区别，好像啥区别也没有�Q?br />是的�Q�branches和tags是一��L���Q�都是目录，只是我们不会对这个release-1.0的tag做修改了�Q�不再提交了�Q�如果提交那么就是branches<br /><br />需求三�Q?br />有一天，�H�然在trunk下的core中发��C��个致命的bug,那么所有的branches一定也一样了�Q�该怎么办？<br />svn-r148:149mergesvn://server/trunkbranches/ep其中148�?49是两�ơ修改的版本受���SVN中tag branch trunk用法介绍完毕�?img src ="http://www.aygfsteel.com/paulwong/aggbug/413344.html" width = "1" height = "1" /><br><br><div align=right><a style="text-decoration:none;" href="http://www.aygfsteel.com/paulwong/" target="_blank">paulwong</a> 2014-05-07 00:10 <a href="http://www.aygfsteel.com/paulwong/archive/2014/05/07/413344.html#Feedback" target="_blank" style="text-decoration:none;">发表评论</a></div>]]></description></item></channel></rss>                                                                           <footer>
<div class="friendship-link">
<a href="http://www.aygfsteel.com/" title="&#29408;&#29408;&#20037;&#20037;&#20122;&#27954;&#27431;&#32654;&#19987;&#21306;&#95;&#20013;&#25991;&#23383;&#24149;&#20122;&#27954;&#32508;&#21512;&#20037;&#20037;&#50;&#48;&#50;&#95;&#22269;&#20135;&#31934;&#21697;&#20122;&#27954;&#31532;&#20116;&#21306;&#22312;&#32447;&#95;&#26085;&#26412;&#20813;&#36153;&#32593;&#31449;&#35270;&#39057;">&#29408;&#29408;&#20037;&#20037;&#20122;&#27954;&#27431;&#32654;&#19987;&#21306;&#95;&#20013;&#25991;&#23383;&#24149;&#20122;&#27954;&#32508;&#21512;&#20037;&#20037;&#50;&#48;&#50;&#95;&#22269;&#20135;&#31934;&#21697;&#20122;&#27954;&#31532;&#20116;&#21306;&#22312;&#32447;&#95;&#26085;&#26412;&#20813;&#36153;&#32593;&#31449;&#35270;&#39057;</a>

</div>

</footer>


��վ֩���ģ�壺
<a href="http://" target="_blank">�˱���</a>|
<a href="http://" target="_blank">������</a>|
<a href="http://" target="_blank">ˮ����</a>|
<a href="http://" target="_blank">������</a>|
<a href="http://" target="_blank">��˳��</a>|
<a href="http://" target="_blank">���</a>|
<a href="http://" target="_blank">������</a>|
<a href="http://" target="_blank">ī����</a>|
<a href="http://" target="_blank">������</a>|
<a href="http://" target="_blank">�ֲ���</a>|
<a href="http://" target="_blank">��ɽ��</a>|
<a href="http://" target="_blank">�º���</a>|
<a href="http://" target="_blank">������</a>|
<a href="http://" target="_blank">��¹��</a>|
<a href="http://" target="_blank">��ԭ</a>|
<a href="http://" target="_blank">������</a>|
<a href="http://" target="_blank">��Դ��</a>|
<a href="http://" target="_blank">������</a>|
<a href="http://" target="_blank">º����</a>|
<a href="http://" target="_blank">��ľ������</a>|
<a href="http://" target="_blank">��Զ��</a>|
<a href="http://" target="_blank">������</a>|
<a href="http://" target="_blank">�����</a>|
<a href="http://" target="_blank">�ƴ�����</a>|
<a href="http://" target="_blank">��ľ����</a>|
<a href="http://" target="_blank">��ľ����</a>|
<a href="http://" target="_blank">������</a>|
<a href="http://" target="_blank">�½���</a>|
<a href="http://" target="_blank">���״�������</a>|
<a href="http://" target="_blank">��«����</a>|
<a href="http://" target="_blank">��������</a>|
<a href="http://" target="_blank">ʯ̨��</a>|
<a href="http://" target="_blank">ͭ����</a>|
<a href="http://" target="_blank">����ɽ��</a>|
<a href="http://" target="_blank">������</a>|
<a href="http://" target="_blank">������</a>|
<a href="http://" target="_blank">������</a>|
<a href="http://" target="_blank">������</a>|
<a href="http://" target="_blank">����</a>|
<a href="http://" target="_blank">��ɽ��</a>|
<a href="http://" 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>