Difference between revisions of "Svn practices"
From Apache OpenOffice Wiki
(→Read-only access) |
|||
| Line 8: | Line 8: | ||
*Grab the whole source code from main trunk | *Grab the whole source code from main trunk | ||
<nowiki>svn co https://svn.apache.org/repos/asf/incubator/ooo/trunk ooo</nowiki> | <nowiki>svn co https://svn.apache.org/repos/asf/incubator/ooo/trunk ooo</nowiki> | ||
| + | |||
*Grab a branche | *Grab a branche | ||
| + | |||
*Update your tree | *Update your tree | ||
| + | svn update | ||
| + | |||
*Update to a specific revision | *Update to a specific revision | ||
| + | |||
*Check changes in specific revision | *Check changes in specific revision | ||
| + | svn diff | ||
==Write access== | ==Write access== | ||
| − | Commit your changes | + | *Commit your changes |
| − | Check changes before commit | + | *Check changes before commit |
| − | Specify in the command line a list of the files/dirs that are changed to avoid accidentally committing unwanted changes. | + | *Specify in the command line a list of the files/dirs that are changed to avoid accidentally committing unwanted changes. |
| − | Template for the log files should be used | + | *Template for the log files should be used |
svn commit ci -F ../mychangelog.txt change1 change2 | svn commit ci -F ../mychangelog.txt change1 change2 | ||
| Line 28: | Line 34: | ||
Update bugzilla with revision information for crossreference when you are done with the commit | Update bugzilla with revision information for crossreference when you are done with the commit | ||
| − | How to create a branche of your own. When it comes to big or complicated changes, you may don't want to commit in stable branch directly. | + | *How to create a branche of your own. When it comes to big or complicated changes, you may don't want to commit in stable branch directly. |
| − | + | ||
| − | + | ||
| − | + | *How to merge your changes | |
| − | + | ||
==Reference== | ==Reference== | ||
Revision as of 07:23, 5 June 2012
This page is still in draft. This line will be removed after the page been reviewed.
This page gathered svn practices frequently used by contributors and committers. If you have any advice to this page, please feel free to update it or discuss your idea in ooo-dev mail list.
Contents
Read-only access
- Grab the whole source code from main trunk
svn co https://svn.apache.org/repos/asf/incubator/ooo/trunk ooo
- Grab a branche
- Update your tree
svn update
- Update to a specific revision
- Check changes in specific revision
svn diff
Write access
- Commit your changes
- Check changes before commit
- Specify in the command line a list of the files/dirs that are changed to avoid accidentally committing unwanted changes.
- Template for the log files should be used
svn commit ci -F ../mychangelog.txt change1 change2
Do not use 'svn commit -m "Your comment".
Update bugzilla with revision information for crossreference when you are done with the commit
- How to create a branche of your own. When it comes to big or complicated changes, you may don't want to commit in stable branch directly.
- How to merge your changes
Reference
A guide for new committers: http://www.apache.org/dev/new-committers-guide.html
Merge Instruction from FreeBSD: http://wiki.freebsd.org/SubversionPrimer/Merging
