Changes between Version 22 and Version 23 of SVN


Ignore:
Timestamp:
Jun 30, 2010, 9:59:32 AM (9 years ago)
Author:
Frederico Caldeira Knabben
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • SVN

    v22 v23  
    44
    55The SVN repository used for the development can be found at ([/browser browsable]):[[BR]]
    6 http://svn.fckeditor.net
     6http://svn.ckeditor.com
    77
    88The 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).
    99
    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.
     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.
    1111
    1212== Nightly Build ==
    1313
    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:
     14Every night, at 0:30 PST, a "'''Nightly Build'''" is generated, from the SVN version. Visit the following web site to download it:[[BR]]
     15http://nightly.ckeditor.com/
    1516
    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].
     17You may also test the nightly online directly [http://nightly.ckeditor.com/demo here].
    2018
    2119The 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.
     
    5351=== The "trunk" ===
    5452
    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).
     53The 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).
    5654
    5755Starting 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".
     
    7573When '''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).
    7674
    77 If you are insecure, don't be afraid of asking others to execute this task for you.
     75If you are unsure, don't be afraid of asking others to execute this task for you.
    7876
    7977TortoiseSVN 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.
     
    8785Try 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.
    8886
    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:
     87The 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:
    9088
    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 tagging
     89 * #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.
    9492
    9593== Links ==
    9694
    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]]
    9896http://tortoisesvn.tigris.org/
    9997
© 2003 – 2019 CKSource – Frederico Knabben. All rights reserved. | Terms of use | Privacy policy