Svn practices

From Apache OpenOffice Wiki
Revision as of 09:30, 5 June 2012 by Mayongl (Talk | contribs)

Jump to: navigation, search

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.

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
  Patch by:
  Suggested by:
  Found by:
  Review by:

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


Working with branch

There at least two situations that you need work with branche.

Know how to work with branch is also helpful even you don't get your own branch. For example, after AOO 3.4 is released, a branch for AOO 3.4.1 was created.

svn merge should be used if you get a fix need be submitted to both the 3.4.1 branch and main line.

  • 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

SVN book: http://svnbook.red-bean.com/en/1.7/svn-book.html

Personal tools