Revision as of 20:12, 9 March 2008 by Pez4brian (Content moved out of "Brief Introduction to SVN")
- Adding new files
- All the files with the translatable strings must be listed in the po/POTFILES.in file. This means that most new files must have their names added to that file.
- All the files that need to be released must be listed in the Makefile.am in the same directory. Please remember to do this for new files that you add to SVN.
- You'll also need to set several properties for new files. For .py files, try the following:
svn propset svn:mime-type text/plain src/somefile.py svn propset svn:eol-style native src/somefile.py svn propset svn:keywords 'Id' src/somefile.py
- Bugfixes in branches
- Whenever a bug is fixed in a branch, it should be the committer's responsibility to make sure the fix is also committed to the trunk.
- You can do this manually, but you can also create a patch on gramps22 branch and apply it to trunk:
gramps22$ svn diff -r PREV > ~/mypatch.patch gramps22$ cd ../trunk trunk$ patch -p0 < ~/mypatch.patch
- Then you may have to fix things that could not be applied due to conflicts. The patch program would mark the conflicts with the <<<<<<, ======, and >>>>>> signs. You will then need to commit your changes:
- More info: http://svnbook.red-bean.com/
- ChangeLog entries
- Every change to the code should be documented in the top-level ChangeLog file (or in per-directory ChangeLog for po and help directories). When possible, we'd like to stick to the GNU ChangeLog standards.
- This especially goes for committing contributed code. In that case, the ChangeLog should list the contributor's name and email, not the maintainer's.