iOS开发Xcode5   SVN配置 使用办法

这两天响应老板要求，把所有代码放到公司的SVN服务器上，按照我的想法肯定是就苹果组建一个服务器，然后内部版本控制，自带的Xcode就有这个功能，之前也这么做过，但是xcode4.X系列SVN还是很好用，自从升级到Xcode5之后还没弄过。今天试了一下午还是没完全明白，眼看弄不出来，就直接用命令行了，不过一些简单的东西还是试出来了。1.如何使用Xcode5 SVN从公司服务器 check out项目


.Choose Source Control > Check Out..Select the repository you want to checkout, and click Next.You can select your repository from the Repositories tab,the Favorites tab, or the Recents tab. If you know the location of therepository you want to check out, you can also enter the address manually..If Xcode is unable to automaticallyidentify the trunk and branches, use the browser window to select the correctproject location, and click Next..In the Checkout window, select thebranches and working copies to check out, and click Next.You will bepresented only with the necessary options for your repository. If your projectcontains only one working copy, you will only have to select the branch tocheckout. If your project doesn’t contain branches, you will only be given anoption of working copies to checkout. If you project is a single working copywith no branches, this dialog will be skipped entirely..Select the location to store the workingcopy, and click Check Out.2.当有修改时，在SourceControl里面可以做点什么，我试了下commit，可以提交到本地，但是没有提交到服务器，中间包括-1012错误，然后配置git用户名跟邮箱。然后填写版本注释，然后就提交，看似提交成功，服务器上却没有。


3.Push localchanges:我点击了试试，就出来下面这个，我有点疑惑，后来发现人家是push local changes to aremote git repository



然后我就有点怀疑，难道Xcode自带的SVN的subversion类型不支持提交到服务器这个功能么。然后看帮助文档，有这么一句。If you’re using Subversion, a commitoperation copies the changes from selected files into the remote Subversionrepository. Therefore, you must be connected to the repository before you cancommit changes. (For details, see your repository administrator.)搞了半天不懂see your repository administrator是什么意思。翻译出来是库管理员。我只想说看他有个毛用。我自能默默自嘲英文差。
4.然后我就想着再继续往下看。Updating or Pulling Changes from a Repository如何更新和提交更改。然后就看到下面的内容。Update your project with changes fromthe repository using the Source Control menu. Fora Git repository, choose Source Control > Pull. Fora Subversion repository, choose Source Control > Update. Fora project that contains both Git and Subversion repositories, choose SourceControl > Update and Pull.For projects with multiple repositories,select the ones you want to update.Resolve differences by using the leftand right buttons to specify which file’s contents to use.After reconciling all differences, clickPull (Git) or Update (SVN) to complete the operation.打开Source Control就没有找到Pull和Update。本来就英文差，他妈的刚巧就认得这几句，然后就此作罢。大牛莫要嘲笑我，还请告知我是哪里出了问题。但是事情不能不做，就在网上找了命令实验了一下，尽可能写的详细点，下次看的时候好懂。随便帮帮跟我一样正在郁闷的人。

1.更改配置（没试过）bogon:~ chenshuangchou$ open ~/.subversion/config启动配置文件，然后在配置文件中选择要忽略的文件类型找到global-ignores 一行，去掉注释，编辑成global-ignores = build *~.nib*.so *.pbxuser *.mode *.perspective*# global-ignores = *.o *.lo*.la *.al .libs *.so *.so.[0-9]* *.a *.pyc *.pyo
找到enable-auto-props = yes 把注释去掉，在[auto-props]Section声明以下文本文件*.mode* =svn:mime-type=text/X-xcode*.pbxuser =svn:mime-type=text/X-xcode*.perspective* =svn:mime-type=text/X-xcode*.pbxproj =svn:mime-type=text/X-xcode
2.import命令首先将本地代码import到版本库bogon:~ chenshuangchou$ svn import/Users/chenshuangchou/Desktop/BuickIOS/Buickhousekeeper https://192.168.21.248:8443/svn/BuickIOS/ -m "initial import"
3.checkout命令然后从版本库checkout出来，这个目录就相当于被激活，内部跟服务器地址关联。bogon:~ chenshuangchou$svn checkout https://192.168.21.248:8443/svn/BuickIOS//Users/chenshuangchou/Desktop/BuickIOS
4.add命令当有新增的文件时用add指令，增加到版本库，然后提交svn add/Users/chenshuangchou/Desktop/BuickIOS/Buickhousekeeper/ViewControllers/CarViewController/FuelManageViewController/lastmouth_color1.png 执行这条指令的前提是/Users/chenshuangchou/Desktop/BuickIOS/是从服务器checkout下来的目录，也就是is a working copy新增成功的话会有A (bin) Desktop/BuickIOS/Buickhousekeeper/ViewControllers/CarViewController/FuelManageViewController/lastmouth_color1.png

5.commit命令提交内容到版本库bogon:~ chenshuangchou$ svn commit -m "添加了一个油耗柱状图"/Users/chenshuangchou/Desktop/BuickIOS/Buickhousekeeper/ViewControllers/CarViewController/FuelManageViewController/lastmouth_color1.png提交到版本库成功的话，Adding (bin) Desktop/BuickIOS/Buickhousekeeper/ViewControllers/CarViewController/FuelManageViewController/lastmouth_color1.pngTransmitting file data .Committed revision 3.

6.update命令更新版本库到本地，更新指定目录，svn update如果后面没有目录，默认将当前目录以及子目录下的所有文件都更新到最新版本。bogon:~ chenshuangchou$svn update /Users/chenshuangchou/Desktop/BuickIOS1更新成功Updating 'Desktop/BuickIOS1':A Desktop/BuickIOS1/Buickhousekeeper/ViewControllers/CarViewController/FuelManageViewController/lastmouth_color1.pngUpdated to revision 3.
回退到版本2: bogon:~ chenshuangchou$svn update -r 2 Desktop/BuickIOS1/回退成功的话Updating 'Desktop/BuickIOS1':D Desktop/BuickIOS1/Buickhousekeeper/ViewControllers/CarViewController/FuelManageViewController/lastmouth_color1.pngUpdated to revision 2.
冲突(更新，于版本库同步。如果在提交的时候提示过期的话，是因为冲突，需要先update，修改文件，然后清除svn resolved，最后再提交commit)在提交时发生版本冲突会怎么样bogon:~ chenshuangchou$svn commit -m "在delegate中加入了一句话"/Users/chenshuangchou/Desktop/BuickIOS/Sending Desktop/BuickIOS/.git/indexSending Desktop/BuickIOS/Buickhousekeeper/AppDelegate.hSending Desktop/BuickIOS/Buickhousekeeper.xcodeproj/project.xcworkspace/xcuserdata/chenshuangchou.xcuserdatad/UserInterfaceState.xcuserstateTransmitting file data ...Committed revision 4.bogon:~ chenshuangchou$svn commit -m "在delegate中加入了一句不同的话"/Users/chenshuangchou/Desktop/BuickIOS1/Sending Desktop/BuickIOS1/.git/indexsvn: E160042: Commit failed (detailsfollow):svn: E160042: File or directory'.git/index' is out of date; try updatingsvn: E160024: resource outof date; try updatingout of date表示版本过期，可能是由于另外的开发者更新了服务器版本，而本地代码与服务器冲突
遇到这种情况，应该先从服务器update一下，然后再提交bogon:~ chenshuangchou$svn update Desktop/BuickIOS1/Updating 'Desktop/BuickIOS1':Conflict discovered in'/Users/chenshuangchou/Desktop/BuickIOS1/.git/index'.Select: (p) postpone, (mf)mine-full, (tf) theirs-full, (s) show alloptions: 在这里会有一个选择，选择（s）会显示所有选项的所有注释，如下(s) show all - show this list(e) edit - change merged file in an editor(df) diff-full - show all changes made to merged file(r) resolved - accept merged version of file(dc) display-conflict - show allconflicts (ignoring merged version)(mc) mine-conflict - acceptmy version for all conflicts (same)(tc) theirs-conflict - accepttheir version for all conflicts (same)(p) postpone - mark the conflictto be resolved later。(mf) mine-full - accept my versionof entire file (even non-conflicts)(tf) theirs-full -accept their version of entire file (same)选择一个之后会继续显示冲突点，直到完。而每一个点都会询问怎么处理。G Desktop/BuickIOS1/Buickhousekeeper.xcodeproj/project.xcworkspace/xcuserdata/chenshuangchou.xcuserdatad/UserInterfaceState.xcuserstateConflict discovered in'/Users/chenshuangchou/Desktop/BuickIOS1/Buickhousekeeper/AppDelegate.h'.Select: (p) postpone, (df) diff-full,(e) edit, (mc)mine-conflict, (tc) theirs-conflict, (s) show alloptions: tfG Desktop/BuickIOS1/Buickhousekeeper/AppDelegate.hUpdated to revision 4.选择tf之后，冲突点会被服务器上的代码覆盖，自己本地代码会永久不见。最好先选择postpone，确定之后再修改。关于冲突，可以参考：http://www.logicaltrinkets.com/wordpress/?p=178

7.status命令查看文件或者目录状态svn status path（目录下的文件和子目录的状态，正常状态不显示）?：不在svn的控制中；M：内容被修改；C：发生冲突；A：预定加入到版本库；K：被锁定svn status -v path显示所有文件的修改信息，在查看状态的同时，显示本地当前版本号，最后一次修改的版本号和修改人，分别在前bogon:~ chenshuangchou$svn status Desktop/BuickIOS1/M Desktop/BuickIOS1/.git/index? Desktop/BuickIOS1/.git/objects/1c/7d8324a67dcd866bd0b4122b01b924a0e77128? Desktop/BuickIOS1/.git/objects/75/1826a72a4afd4b15faf73a0b6e4166d3bbec01? Desktop/BuickIOS1/.git/objects/a4/1c23190a65cda6a64a95bef22a9264ad64d90e? Desktop/BuickIOS1/.git/objects/b3/df5dbb592745d9744adf7a32ed2bb39370c78eM Desktop/BuickIOS1/Buickhousekeeper/AppDelegate.h? Desktop/BuickIOS1/Buickhousekeeper/lastmouth_color1.png? Desktop/BuickIOS1/Buickhousekeeper/lastmouth_color2.png? Desktop/BuickIOS1/Buickhousekeeper/lastmouth_color3.png? Desktop/BuickIOS1/Buickhousekeeper/lastmouth_color4.pngM Desktop/BuickIOS1/Buickhousekeeper.xcodeproj/project.pbxprojM Desktop/BuickIOS1/Buickhousekeeper.xcodeproj/project.xcworkspace/xcuserdata/chenshuangchou.xcuserdatad/UserInterfaceState.xcuserstate

8.delete命令svn deletepath -m " delete test fle "删除一个空白的文件夹：bogon:~ chenshuangchou$svn delete /Users/chenshuangchou/Desktop/BuickIOS/branchesD Desktop/BuickIOS/branches显示删除成功

9.log命令查看版本记录，也叫日志bogon:~ chenshuangchou$ svn log/Users/chenshuangchou/Desktop/BuickIOS------------------------------------------------------------------------r3 | chensc | 2013-10-31 11:34:03 +0800(四, 31 10 2013) | 1 line
添加了一个油耗柱状图------------------------------------------------------------------------r2 | chensc | 2013-10-28 12:00:36 +0800(一, 28 10 2013) | 1 line
initial import------------------------------------------------------------------------r1 | VisualSVN Server | 2013-06-2817:40:29 +0800 (五, 28 6 2013) | 1 line
Initial structure.
只有两个版本记录，说明第二个版本和第三个版本未添加版本说明，也就是在执行指令时未添加－m ，这个指令是添加注释

10.diff命令svn diff path(将修改的文件与基础版本比较)在上传版本时，可能有自己版本与服务器版本不一致，需要查看具体代码，这个命令就可以做到svn diff -r m:n path对版本m和版本n比较差异在追溯版本问题时，这个命令也十分有用bogon:~ chenshuangchou$svn diff /Users/chenshuangchou/Desktop/BuickIOS1---/Users/chenshuangchou/Desktop/BuickIOS1/Buickhousekeeper/AppDelegate.h(revision 4)+++/Users/chenshuangchou/Desktop/BuickIOS1/Buickhousekeeper/AppDelegate.h (workingcopy)@@ -6,6 +6,7 @@ // Copyright (c) 2013年 calinks. All rights reserved. //测试的很好
+ #import #import "BMapKit.h"
@@ -15,7 +16,7 @@ - (void)refreshIdeaMessage;
- (void)refreshMaintainMessage;-@end+@end

11.merge命令将两个版本之间的差异合并到当前文件bogon:BuickIOS chenshuangchou$ svn merge -r 4:5/Users/chenshuangchou/Desktop/BuickIOS/Buickhousekeeper/AppDelegate.h一般会发生冲突，处理冲突—/Users/chenshuangchou/Desktop/BuickIOS/Buickhousekeeper/svn-1FUb4k 四 10 31 15:36:15 2013+++/Users/chenshuangchou/Desktop/BuickIOS/.svn/tmp/AppDelegate.h.tmp 四 10 31 15:36:16 2013@@ -4,8 +4,13 @@ // Copyright (c) 2013年 calinks. All rights reserved.-//测试的很好+<<<<<<< .working+//测试一下+=======+//验证版本差异合并+>>>>>>>.merge-right.r5

12.ls命令版本库下的文件和目录列表svn list path显示path目录下的所有属于版本库的文件和目录bogon:BuickIOS chenshuangchou$ svn ls https://192.168.21.248:8443/svn/BuickIOS/.git/Buickhousekeeper/Buickhousekeeper.xcodeproj/DevOneSDK.framework/branches/tags/trunk/
13.log命令查看文件详细信息bogon:~ chenshuangchou$svn info/Users/chenshuangchou/Desktop/BuickIOS/Buickhousekeeper/AppDelegate.h Path:Desktop/BuickIOS/Buickhousekeeper/AppDelegate.hName: AppDelegate.hWorking Copy Root Path:/Users/chenshuangchou/Desktop/BuickIOSURL: https://chensc@192.168.21.248:8443/svn/BuickIOS/Buickhousekeeper/AppDelegate.hRepository Root:https://chensc@192.168.21.248:8443/svn/BuickIOSRepository UUID:9a03820f-37b7-b94a-a594-74c58a350bc6Revision: 4Node Kind: fileSchedule: normalLast Changed Author: chenscLast Changed Rev: 4Last Changed Date: 2013-10-31 14:04:51+0800 (四, 31 10 2013)Text Last Updated: 2013-10-31 14:02:51+0800 (四, 31 10 2013)Checksum:83d8a08d317af33501b650517aa4033d5fe9f0d4
14.其它命令svn mkdir:创建纳入版本控制下的新目录。用法: 1、mkdir PATH...2、mkdir URL...svn revert:恢复原始未改变的工作副本文件(恢复大部份的本地修改)。revert:用法: revert PATH...注意:本子命令不会存取网络，并且会解除冲突的状况。但是它不会恢复被删除的目录svn switch (sw): 更新工作副本至不同的URL。用法: 1、switch URL [PATH] 2、switch --relocate FROM TO [PATH...]svn resolved:移除工作副本的目录或文件的“冲突”状态。用法: resolved PATH...注意:本子命令不会依语法来解决冲突或是移除冲突标记；它只是移除冲突的相关文件，然后让PATH可以再次提交。svn cat输出指定文件或URL的内容。svn cat目标[@版本]...如果指定了版本，将从指定的版本开始查找。svn cat -r PREVfilename > filename (PREV 是上一版本,也可以写具体版本号,这样输出结果是可以提交的)

原文连接：http://blog.sina.com.cn/s/blog_68661bd80101phpy.html