Changes between Version 21 and Version 22 of UsingGitToMaintainGDALWorkflow

Timestamp:

Oct 3, 2012, 5:08:23 PM (12 years ago)

Author:

Robert Coup

Comment:

Added --prefix to git svn init. Added git config for authorsfile

UsingGitToMaintainGDALWorkflow

@@ -68 +68 @@
 
 {{{
-$ git svn init --trunk https://svn.osgeo.org/gdal/trunk/
+$ git svn init --prefix=svn --trunk https://svn.osgeo.org/gdal/trunk/
 }}}
 
-The option ''--trunk'' explicitly specifies intention of this operation.
+The option ''--trunk'' explicitly specifies intention of this operation. We use `--prefix` so remote svn branches are named eg. 'svn/trunk' rather than 'trunk', since otherwise you get unhelpful name clashes when doing cross-branch operations.
 
 It is also possible to copy complete repository, including trunk, branches and tags modules. Learn about ''--stdlayout'' option dedicated for this purpose. However, note that this initial fetch is a time consuming process. (fetching of SVN trunk takes nearly one hour).
@@ -81 +81 @@
 }}}
 
-The file ''gdal-git-authors.txt'' (attached) is used by Git to translate names of SVN committers to Git names which uses format "Full name <e-mail>". Specifying the ''--authors-file'' option is optional, but recommended.
+The file ''gdal-git-authors.txt'' (attached) is used by Git to translate names of SVN committers to Git names which uses format "Full name <e-mail>". Specifying the ''--authors-file'' option is optional, but recommended. You can also do this once via `git config --add svn.authorsfile /path/to/gdal-git-authors.txt`, then you don't have to specify it when you're running other `git svn` commands as described below.
 
 It may be a good idea to compress Git repository in order to save some space. For example, SVN trunk occupies nearly 140 MB of disk space. Git can compress it to about 100 MB. Git provides a dedicated command for this purpose [http://www.kernel.org/pub//software/scm/git-core/docs/git-gc.html git-gc]: