ở đây. Lưu ý chúng tôi không cần phải chỉ định một sửa đổi e. cá tuyết chi nhánh là một bản sao của phiên bản tôi sẽ đặt điều này trong thư mục BeatBoxV1 thời gian con số này sửa đổi dừng lại có nghĩa là càng nhiều, bởi vì chúng ta đang sử dụng thẻ để sửa đổi tài liệu tham khảo thay vì | working with branches Fixing Version real this time. When we had everything in the trunk we got an error trying to commit old patched code on top of our new code. Now though we ve got a tag for version and a branch to work in. Let s fix Version in that branch a First check out the version-1 branch of the BeatBox code here -----The braTeh is a of the version Code- File Edit Window Help History We ll Y t this in the BeatftoWl dvrettor this feme- hfsd svn checkout file c Users Developer Desktop SVNRepo BeatBox branches version-1 BeatBoxV1 A BeatBoxV1 src A BeatBoxV1 src headfirst A BeatBoxV1 src headfirst sd A BeatBoxV1 src headfirst sd chapter6 A BeatBoxV1 src headfirst sd chapter6 A BeatBoxV1 src headfirst sd chapter6 Checked out revision 9. hfsd These revisions numbers stop meaning as mueh because we re using tags to reference revisions instead o-f revision numbers. a Now you can fix the bug Bob found. We re working here in the version-1 branth- 208 Chapter 6 version control 3 .and commit our changes back in. This time though no conflicts File Edit Window Help Sweet hfsd svn commit src headfirst sd chapter6 -m Fixed the critical security bug in release. The s j the Vrant - Sending src headfirst sd chapter6 Committed revision 10. hfsd We have TWO code bases now With all these changes we ve actually got two different sets of code the branch where fixes are made to Version and the trunk which has all the new development. Our trunk directory in the repository has the latest and greatest code that s still in development and Bob applied the security fix there too . We have a tag in our tags directory so we can pull out Version whenever we want. We have a version-1 branch in our branches directory that has all of our critical patches that have to go out as a version without any of the new development work. p have -to- you are here 4 209 branches tags and subversion
