Saturday, March 7, 2009

how to use git with collective (svn)

probably you are wondering why the hack would i use git when dealing with collective (svn). there are lot of reasons. i'll try to explain my working procces and feel free to comment it and even suggest better/different way.

for start you need git. its important that is version 1.6.1 (or above) since new cool options just found place in this release.

1. pulling project out of collective

git svn clone --trunk=trunk --tags=tags --branches=branches --revision=75010:HEAD

options (see "git svn clone --help" for more):
--trunk: used to define where trunk folder lives
--tags: used to define where tags folder lives
--branches: used to define where branches folder lives
--revision: range of history with revisions that you want to pull

75010 is revision when Products.TinyMCE was first introduced in collective. and because collective is pretty large repository and we dont want to overload it, i really advice you to specifiy --revision. this will also make cloning go faster.

after you are done git created Products.TinyMCE folder with trunk content inside it.

2. commiting to collective and updating from it
now that we have our working git clone we start working and soon and as we work we can commit changes, but this changes wont show up in the collective repo just yet. you could say you have local repo. so commiting works the same way we would normaly do with

cd Products.TinyMCE
echo "# useless code" >> # we do some changes
git commit # commit localy
... # we work some more
git svn dcommit # finaly we push to collective

... # now new changes are avail. in collective for us to pick them

git svn rebase
# works like svn update

3. taging for release
normaly before release you also tag certain revision to some tag.

git svn dcommit # make sure all is commited to collective
git svn tag # tag it

4. stashing ...
(your boss will like it)
its a calm monday morning and you just started to work on new feature on project you are working. last weekend deployment was a success. next minute your boss brakes the door because there is some very important bug you need to fix (normaly is not that important, since nobody dies because of my code, but anyway some takes life more serious then me). you have some not commited code laying around and you would quickly need to return to commited version. with git its easy...

git stash # now your uncommited changes are stashed
... # work on that important bug and make your boss happy, commit it, deploy, etc...
git stash apply # and you are back to calm monday morning

5. working with branches
all your branches and tags are pulled into git. lets look them:

git branch -r # list all remote branches
git branch # list all local branches
* master
git checkout -b fix-strange-1.2-bug 1.2 # we create local branch for fixing strange bug that apeared in 1.2 branch
git branch # * is marking current active branch
git checkout master # we switch back to master branch
git svn fetch # fetches the updates with out modifying the local working files (which git svn rebase would)


there is one drawback when using git with svn. this is external repositories, but more about this next time.


Anonymous said...

Hey man, cool blog (appart from english:-))! As for git, yeah, it is a real charm. Let me raise your attention also to the tig, gitosis (
and git-trac combination. Especially the latter one gives a real sense to the collaborative work!
P.s.: Do not lose too much time on Plone/Zope, it is actually quite a pile of beast code. There are other (better) paid deeds than web design!!!

Ross Patterson said...

Thanks for the post! I've been using it to finally get started with distributed version control.

BTW, I found that the "-s" argument to "git-svn clone" or "git-svn init" makes the initial command much more terse since you don't need the "--trunk..." stuff for properly structured SVN repositories.

Rok Garbas said...

@ross: nice one ... -s (--stdlayout) using it from now on. tnx

@anon: already using gitosis, really nice peace of code. git-trac i dont konw since i dont really like trac. call me weird but i just find trac not inutitive enough. plus there is really cool git thingy you can use for bug tracking: git-issues.
zope/plone: its about ppl we work with, community is what i like most.
my-english: i'm damn proud of it :)

getpaidtotry said...

There are also larger offers that can be completed for a more substantial bonus. There are many GPT sites that offer up to $100 for signing up for a sponsored credit card. There are even sites that will give their members gifts such as Laptop computers, MP3 players, and game console systems for completing certain higher-end offers.

online survey jobs

getpaidtotry said...

The first thing that you need to understand about some paid surveys are that they are not all legit. This is probably why so many legit paying survey companies get such a bad rap.

get paid for online surveys