SVN: 冲突解决 合并别人的修改(待整理)

This tutorial is walkthough on how to resolve a conflict in svn (subversion) 这个手册是解决svn冲突的攻略 First I will make a test.txt 首先，我创建了一个名为test.txt的文件（在svn服务器端），并录入如下内容 test Now I will commit the changes 现在我们提交刚刚添加的内容 C:\workspace\test>svn ci -m "making a starting point" Sending . Sending test.txt Transmitting file data . Committed revision 2. Suppose we have 2 users. User1 and User2. Both of them will get and update from svn 假设我们有用户1和用户2两个人通过svn客户端获取svn服务器端的文件test.txt C:\workspace\test>svn up A test.txt At revision 2. Now User1 will change the file to: 现在用户1更改文件test.txt内容为如下 User1 is making a conflict test He then commits his changes 然后用户1提交刚才的更改 C:\workspace\test>svn ci -m "User1 starting a conflict" Sending . Sending test.txt Transmitting file data . Committed revision 3. User2 now comes along and changes his local copy of the file not knowing that it has already been updated by User1 on the server. 用户2也对文件test.txt做了更改，此时他并不知道用户1做了更改并已提交。 test User2 making a conflict When he tries to commit he will get and error from svn. 当用户2修改文件test.txt完毕后，准备提交时出错。 svn: Commit failed (details follow): svn: File or directory 'test.txt' is out of date; try updating svn: resource out of date; try updating So User2 performs an update 根据错误提示，用户2更新了文件test.txt（此时发生了冲突） C:\workspace\test>svn up Conflict discovered in 'test.txt'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: svn detects that theres a conflict here and require you to take some kind of action. If you type ‘s’ here you will get a list of the commands and meaning 如果你输入s选项，则会列出所有svn解决冲突的选项，如下所示： (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 all conflicts (ignoring merged version) #显示所有冲突 (mc) mine-conflict - accept my version for all conflicts (same) #冲突以本地为准 (tc) theirs-conflict - accept their version for all conflicts (same) #冲突以服务器为准 (mf) mine-full - accept my version of entire file (even non-conflicts)#完全以本地为准 (tf) theirs-full - accept their version of entire file (same) #完全以服务器为准 (p) postpone - mark the conflict to be resolved later #标记冲突，稍后解决 (l) launch - launch external tool to resolve conflict (s) show all - show this list 【选择处理方式一：df】 If you type ‘df’ it will show you a all the conflicts in the following format 选择选项df，则会按如下格式显示所有冲突 Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: df --- .svn/text-base/test.txt.svn-base Tue Aug 10 10:59:38 2010 +++ .svn/tmp/test.txt.2.tmp Tue Aug 10 11:33:24 2010 @@ -1 +1,3 @@ -test \ No newline at end of file +<<<<<<< .mine +test User2 making conflict======= +User1 is making a conflict test>>>>>>> .r3 ‘e’ option will open the conflicted file in the text editor that you configured for svn to use. In this case it will show <<<<<<< .mine test User2 making conflict======= User1 is making a conflict test>>>>>>> .r3 You can resolve the conflict here by changing the text to what you desire. For example: 你可以解决冲突通过改变文件内容，例如vim test.txt User1 is making a conflict test User2 making conflict save your changes and exit your text editor and it will give you the conflict options again. Now if you use the ‘r’ it will mark the file is merged with a ‘G’. A status of ‘G’ means there was a conflict and it has been resolved. 保存更改，又出现刚才的选项。此时你使用r选项，则会合并文件。如下所示： Select: (p) postpone, (df) diff-full, (e) edit, (r) resolved, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: e Select: (p) postpone, (df) diff-full, (e) edit, (r) resolved, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: r G test.txt Updated to revision 3. you can now check the status with svn status. You see that test.txt is marked as ‘M’ all thats left to do is commit. 检查svn状态，你会发现文件test.txt前面已变成M C:\workspace\test2>svn st M test.txt C:\workspace\test2>svn ci -m "conflict resolved" Sending test.txt Transmitting file data . Committed revision 4. 【选择处理方式二：p】 Sometimes the conflicts are a bit more extensive and it requires more time or better tools to resolve the conflict in these cases you can chose ‘p’ to postpone the resolution. 有时，冲突会复杂一些，可能需要借助其他工具才能解决，这时你可以使用选项p Select: (p) postpone, (df) diff-full, (e) edit, (r) resolved, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C test.txt Updated to revision 3. Summary of conflicts: Text conflicts: 1 Now if you look in your directory you will see that svn has created a few extra files for you. 此时，查看当前文件夹下，出现了如下几个文件 08/10/2010 11:44 AM 94 test.txt 08/10/2010 11:44 AM 26 test.txt.mine 08/10/2010 11:44 AM 27 test.txt.r2 08/10/2010 11:44 AM 31 test.txt.r3 The test.txt file is now a file with both User2 and User1′s changes but marked. 文件test.txt包含了用户1和用户2的更改。 <<<<<<< .mine test User2 making conflict======= User1 am making a conflict test>>>>>>> .r3 test.txt.mine is User2′s copy. 文件.txt.mine保存了用户2的内容 test User2 making conflict test.txt.r2 is the original base copy 文件.txt.r2是未冲突前的内容 test test.txt.r3 is the copy User1 commited 文件.txt.r3保存了用户1的内容 User1 is making a conflict test At this point you can choose your favorite merge tools to merge the differences in a file. 这种情况下，你可以选择自己喜欢的对比工具，查看差别。 I suggest merging the differences into test.txt and the do a 我建议和并不同至文件test.txt中，如果如下命令： C:\workspace\test>svn resolve --accept working test.txt Resolved conflicted state of 'test.txt' You can also use any of the other files if you wanted to and just pass resolve –accept a different argument. Here are the valid arguments 当然，你也可以使用其他文件，使用resolve -accept 加其他参数，共6个 实例： svn resolve mail.sh --accept 'mine-conflict' #解决冲突。 svn resolved mail.sh #告知svn。4个文件中的其他3个消失 (1)#svn resolve –accept base Choose the file that was the BASE revision before you updated your working copy. That is, the file that you checked out before you made your latest edits. 使用1.txt.r2作为最后提交的版本 (2)#svn resolve –accept working Assuming that you've manually handled the conflict resolution, choose the version of the file as it currently stands in your working copy. 使用当前拷贝即test.txt作为最后提交的版本 (3)#svn resolve –accept mine-full Resolve all conflicted files with copies of the files as they stood immediately before you ran svn update. 使用test.txt.mine作为最后提交的版本 (4)#svn resolve –accept theirs-full Resolve all conflicted files with copies of the files that were fetched from the server when you ran svn update. 使用test.txt.r3作为最后提交的版本 (5)#svn resolve –accept mine-conflict 冲突的部分以本地修改为准 (6)#svn resolve –accept theirs-conflict 冲突的部分以服务器端修改为准 执行一下：svn resolved test.txt。 Now you are ready to commit. 然后提交 C:\workspace\test>svn ci -m "conflict resolved" Sending test.txt Transmitting file data . Committed revision 4.