Difference between revisions of "Conversion from Subversion to Git"
(→Documentation Changes) |
(→Documentation Changes) |
||
Line 98: | Line 98: | ||
* [[Geographic Report]] - DONE | * [[Geographic Report]] - DONE | ||
* [[HeadlineNewsGramplet]] - DONE | * [[HeadlineNewsGramplet]] - DONE | ||
− | * [[InformationGraph]] | + | * [[InformationGraph]] - DONE |
* [[DescendantsLines]] | * [[DescendantsLines]] | ||
Revision as of 13:04, 7 November 2013
Repository Changes
Revision number
Git uses hashes rather than revision numbers. We plan to keep the subversion revision number in the commit messages, but convert it into a shorter more readable format.
It will be possible to find a subversion revision with:
git log --grep=<revision>
Properties
Git does not have file-level properties. Instead, file attributes can be defined in the .gitattributes file.
Line ending characters (CRLF/LF) and file types (text/binary) can be defined in the .gitattributes file. This will replace the svn:eol-style and svn:mime-type properties.
The svn:ignore properties are replaced by the .gitignore file. This is already present for users of the git mirror.
It is not easy to implement useful keyword expansion of $Id$ in git, so we don't propose to do so. The same information can be obtained with:
git log -1 <path>
Convention
Rename "trunk" to "master".
Procedural
We want to minimize the time window when the commits are not possible during the transition. At some point we'll switch the old SVN repo to read-only mode --- this will be announced on the devel list.
Can we push our commits from the git repositories that tracked John's repo with git-svn, maybe this should be set up as an interim approach?
Code Changes
Convert get_svn_revision to get_git_hash
The function to return the latest svn revision number needs to be replaced by one to return the latest commit hash.
- gramps/gen/svn_revision.py
- gramps/gen/const.py
Code to skip .svn directories
Two files have code for skipping subversion directories:
- gramps/plugins/tool/mediamanager.py
- gramps/test/regrtest.py
We can remove this code at some point. Git does not pollute the source code tree with its files.
Repository url needs changing
Three files contain the repository url in their docstrings:
- gramps/gen/config.py
- gramps/gen/db/__init__.py
- gramps/webapp/init.py
Change svn2cl -> git2cl
There is a reference to svn2cl in the about dialog. There is a git alternative available at http://savannah.nongnu.org/projects/git2cl/.
- gramps/gui/aboutdialog.py
Headline News gramplet
Will this still work?
Bug Tracker Changes
Rename the "Trunk" project to "Master".
Documentation Changes
The main changes required will be to the developer wiki pages:
- Brief introduction to SVN -> Brief introduction to Git
- Getting started with Gramps development
- Running a development version of Gramps
- Committing policies
- What to do for a release
- Development using Eclipse and Pydev
- Addons development
Other wiki pages that will require minor changes:
- Installation alternatives - DONE
- Translating Gramps
- Coding for translation - DONE
- Translation environment4
- Manual Generation - DONE
- Using the bug tracker - DONE (still refers to Trunk Project on the bug tracker)
- Bug triage - DONE (still refers to Trunk Project on the bug tracker)
- Animal pedigree - DONE
- Geographic Report - DONE
- HeadlineNewsGramplet - DONE
- InformationGraph - DONE
- DescendantsLines