Changes between Version 22 and Version 23 of SVN
- Timestamp:
- Jun 30, 2010, 9:59:32 AM (15 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
SVN
v22 v23 4 4 5 5 The SVN repository used for the development can be found at ([/browser browsable]):[[BR]] 6 http://svn. fckeditor.net6 http://svn.ckeditor.com 7 7 8 8 The SVN contains the "development version" of CKEditor. It doesn't reflect the contents of public distributions. Actually, some files are not present in the public downloads (like the "_dev" folder or the compressed "js" files, for example). 9 9 10 '''We don't recommend using this version on production'''. There are also security implications on doing so. To make the SVN version "production safe", it must be processed with CK releaser (available inside _dev). A safer and easier option is to simply use the Nightly Build, which is already processed.10 '''We don't recommend using this version on production'''. There are also security implications on doing so. To make the SVN version "production safe", it must be processed with CKReleaser (available inside _dev). A safer and easier option is to simply use the Nightly Build, which is already processed. 11 11 12 12 == Nightly Build == 13 13 14 Every night, at 0:30 PST, a "'''Nightly Build'''" is generated, from the SVN version. You may download it from one of the following links: 14 Every night, at 0:30 PST, a "'''Nightly Build'''" is generated, from the SVN version. Visit the following web site to download it:[[BR]] 15 http://nightly.ckeditor.com/ 15 16 16 * http://download.cksource.com/CKEditor/CKEditor/Nightly%20Build/ckeditor_nightly.zip 17 * http://download.cksource.com/CKEditor/CKEditor/Nightly%20Build/ckeditor_nightly.tar.gz 18 19 You may also test it online [http://nightly.ckeditor.com/demo here]. 17 You may also test the nightly online directly [http://nightly.ckeditor.com/demo here]. 20 18 21 19 The nightly is processed for public distribution. As the fixes and features available on nightlies are still under testing and development, it may be used on production systems at your own risk. … … 53 51 === The "trunk" === 54 52 55 The trunk is the effective place we'll be working everyday. Usually we'll have local working copies of the trunk only (and possibly any branch).53 The trunk is the effective place we'll be working everyday. Usually we'll have local working copies of the trunk only (and possibly some branches). 56 54 57 55 Starting from version 2.4, the trunk will always have stable code which we can publish to the public SVN, and eventually release officially. So, only important bugs and small changes will be committed here, while more delicate and extensive developments will be done in a "branch". … … 75 73 When '''merging branches to the trunk''', first merge the trunk to the branch and check that everything is ok. Make the necessary changes and commit the branch. Then switch to the trunk and merge the differences between the branch HEAD and the last trunk revision you have just merged to the branch (usually HEAD). Then, if the branch is not anymore needed, just delete it (SVN delete I mean). 76 74 77 If you are insecure, don't be afraid of asking others to execute this task for you.75 If you are unsure, don't be afraid of asking others to execute this task for you. 78 76 79 77 TortoiseSVN offers a nice tool to track the creation an life-cicle of branches. It is called "Revision graph". The SVN log can also be used for it. … … 87 85 Try to make a single commit for each fix or feature. Avoid making big commits with lots of changes. This separation makes each commit an isolate thing. It makes code review and merge tasks easy. 88 86 89 The commit log message is very important. Don't underestimate it. It must be well written and informative. Whenever possible, make references to related trac items, like tickets or changesets. You may use one of the "standard" messages, like the following examples:87 The commit log message is very important. Don't underestimate it. It must be well written and informative. Whenever possible, make references to related Trac items, like tickets or changesets. You may use one of the "standard" messages, like the following examples: 90 88 91 * Fixed#81: IE has a DOM bug that caused FCKDomTools.RTrimNode to break.92 * Merged trunk r131:132 into branches/versions/2.4.x 93 * FCKeditor 2.4 tagging89 * #81: IE has a DOM bug that caused FCKDomTools.RTrimNode to break. 90 * Merged trunk r131:132 into branches/versions/2.4.x. 91 * CKEditor 3.2 tagging. 94 92 95 93 == Links == 96 94 97 '''TortoiseSVN''': the SVN integration with the Windows Shell. This is the best way to work with SVN in Windows:[[BR]]95 '''TortoiseSVN''': the SVN integration with the Windows Shell. This is the best way to work with SVN on Windows:[[BR]] 98 96 http://tortoisesvn.tigris.org/ 99 97