TAILIEUCHUNG - Version Control with Subversion phần 4

Tham khảo tài liệu 'version control with subversion phần 4', công nghệ thông tin, kỹ thuật lập trình phục vụ nhu cầu học tập, nghiên cứu và làm việc hiệu quả | Branching and Merging ing the HEAD revision. That means you want to compare revisions 341 and HEAD of your branch directory and apply those differences to a working copy of the trunk. A nice way of finding the revision in which a branch was created the base of the branch is to use the - -stop-on-copy option to svn log. The log subcommand will normally show every change ever made to the branch including tracing back through the copy which created the branch. So normally you ll see history from the trunk as well. The - -stop-on-copy will halt log output as soon as svn log detects that its target was copied or renamed. So in our continuing example svn log -v --stop-on-copy http repos calc branches my-calc-branch r341 user 2002-11-03 15 27 56 -0600 Thu 07 Nov 2002 2 lines Changed paths A calc branches my-calc-branch from calc trunk 340 As expected the final revision printed by this command is the revision in which my-calc-branch was created by copying. Here s the final merging procedure then cd calc trunk svn update At revision 405. svn merge -r 341 405 http repos calc branches my-calc-branch U U U Makefile svn status M M M Makefile .examine the diffs compile test etc. svn commit -m Merged my-calc-branch changes r341 405 into the trunk. Sending Sending Sending Makefile Transmitting file data . Committed revision 406. Again notice that the commit log message very specifically mentions the range of changes that was merged into the trunk. Always remember to do this because it s critical information you ll need later on. For example suppose you decide to keep working on your branch for another week in order to complete an enhancement to your original feature or bug fix. The repository s HEAD revision 90 Branching and Merging is now 480 and you re ready to do another merge from your private branch to the trunk. But as discussed in the section called Best Practices for Merging you don t

• Kỹ thuật lập trình
• thủ thuật tin học
• mẹo hay cho windows 7
• lập trình ứng dụng windows
• ngôn ngữ lập trình
• nền tảng lập trình
• thủ thuật máy tính
• thủ thuật công nghệ thông tin
• tài liệu tin học
• thông tin công nghệ thông tin
• tuần báo Công Nghệ Thông Tin