[gdal-dev] sandbox access for non-commiters

[Etienne Tourigny]

Just like to update on my recent findings on how you can setup an
environment to be able to commit to the svn repo, and also keep a
separate dev enviroment on github (to work with others)

Mateusz, it would be nice to include your latest instructions on the
wiki page, do you want me to add this stuff as well?


1) Get the entire repo from svn (or use Mateusz's compressed file to
save lots of time)

git svn init --trunk https://svn.osgeo.org/gdal/trunk
git svn --authors-file=/home/src/gdal/git/gdal/gdal-git-authors.txt fetch

2) If needed rebase, and push the entire repo to github (this can take
some time)

git svn --authors-file=/home/src/gdal/git/gdal/gdal-git-authors.txt rebase
git push --all git at github.com:etiennesky/gdal-netcdf

3) Make as many branches as you like and commit them to the git repo
(really fast)

git branch gdal-netcdf-autotest
git checkout gdal-netcdf-autotest
git push git at github.com:etiennesky/gdal-netcdf gdal-netcdf-autotest

4) Commit any changes to the git repo

git commit -m "blabla" .
git push  git at github.com:etiennesky/gdal-netcdf

5) Merge the changes you want into master, and commit to svn (if applicable)

$git checkout master
$git merge gdal-netcdf-autotest
$git svn dcommit -n
Committing to https://svn.osgeo.org/gdal/trunk ...
diff-tree 7edfc78415537dcd98bc141a2c52decadc34647e~1
7edfc78415537dcd98bc141a2c52decadc34647e
diff-tree 1f156cf3e0f055a9d31df422abe7f7c3b2f85348~1
1f156cf3e0f055a9d31df422abe7f7c3b2f85348
$git diff 7edfc78415537dcd98bc141a2c52decadc34647e~1
7edfc78415537dcd98bc141a2c52decadc34647e
... diff output...
$git svn dcommit


Voila!  At least it worked for me...

thanks to Mat and Antonio for their input
Etienne

On Fri, Oct 7, 2011 at 1:14 PM, Antonio Valentino
<antonio.valentino at tiscali.it> wrote:
> Hi Etienne,
>
> Il giorno Fri, 7 Oct 2011 12:52:16 -0300
> Etienne Tourigny <etourigny.dev at gmail.com> ha scritto:
>
>> On Fri, Oct 7, 2011 at 12:49 PM, Antonio Valentino
>> <antonio.valentino at tiscali.it> wrote:
>> > Hi Etienne,
>> >
>> > Il giorno Fri, 7 Oct 2011 11:17:34 -0300
>> > Etienne Tourigny <etourigny.dev at gmail.com> ha scritto:
>
> [CUT]
>
>> >> Is there a way to create a git repo from a subdirectory of the svn?
>> >
>> > Yes:
>> >
>> > $ git svn clone https://svn.osgeo.org/gdal/trunk/gdal/frmts/netcdf
>> >
>>
>> Thanks! that's what I thought
>>
>> >
>> >> I'm not sure such a thing is possible, because the git stuff is at
>> >> the root of the source tree
>> >>
>> >> I really just need the frmts/netcdf directory, which is the best
>> >> option (and which is possible)?
>> >>
>> >> 1) get a clone of just that directory using git svn ; create a
>> >> branch; push to a new git repos
>> >> 2) get a clone of the full source tree using git svn ; create a
>> >> branch ; push the subdirectory to a new git repos
>> >>
>> >> regards,
>> >> Etienne
>> >
>> > I'm not sure to understand what do you want.
>> > If you clone the entire repo and then you create a branch, the new
>> > branch will include the complete source tree (I suppose).
>> >
>>
>>
>> What I meant was, can I clone the entire repo, but only create a git
>> repo with just the subdirectory?
>
> Of course you can if you start the repo from scratch (no clone).
> But in this case you would loose the ability to synchronize repos.
> I guess this is not what you want.
>
>
>> This way I can have the entire source tree within my git-svn setup,
>> but I don't have to copy the entire source when I create a new repo on
>> git, and any new branches I would create.
>
> Well, branching is very very very space and time efficient in DVCS.
> Only differences between branches are recorded.
>
> If you have a clone of the entire repo IMHO you have no need to create
> a new repo for a sub-tree.
>
> Just
> * branch
> * edit
> * commit
> * switch between branches using git checkout
> * ...
>
>
> regards
>
> --
> Antonio Valentino
> _______________________________________________
> gdal-dev mailing list
> gdal-dev at lists.osgeo.org
> http://lists.osgeo.org/mailman/listinfo/gdal-dev
>