[Pkg-isocodes-devel] Evaluation of git [Was: Delaying the next release]

[Tobias Quathamer]

On Wednesday 27 August 2008 20:13:29 Christian Perrier wrote:
> Hmmm, the udeb removal is not that invasive and it only affects D-I
> (and I can certify it does not harm it at all now) so I think we could
> easily convince the release managers.

Thanks for objecting, iso-codes 3.3-1 is now uploaded and unblocked :-)

> > Apart from that, it seems to me that handling different branches of
> > packaging (e.g. oldstable, stable, unstable) is a pain within subversion.
> > If we start to support a backport branch, I would like to move the Debian
> > packaging to e.g. git.
>
> I'm not a great specialist of git but I now can manage working with it
> for basic stuff, so I would agree with such move, as long as you take
> care of the dirty work of converting the repository..:-)

Well, it took me nearly the whole of yesterday to create a git repository from 
subversion. It's been really dirty work. I'm still not totally satisfied, but 
I've copied the result to git.d.o so you (and others) can evaluate it. During 
the conversion, I had the opportunity of fixing some misplaced tags and 
creating some missing tags.

I propose the following branch scheme: We have a main branch (equivalent to 
SVN's trunk), called "master" in git. The debian directory is removed from 
that branch and instead recreated on a split-off branch, called "debian". If 
a contributor checks out the git repository, they will only get "upstream" 
files, not the Debian specific stuff. If you need that, you check out the 
debian branch as well and start working there. When a new upstream release is 
made, the branch "master" gets merged into "debian" to create a new Debian 
release. With this scheme, we can also quite easily create a branch 
called "lenny" or "etch" for backports.

Here's a quick README for testing the git repository:

Clone the repository
$ git clone git://git.debian.org/~toddy/iso-codes.git
Create your debian branch
$ git checkout -b debian origin/debian
Switch back to master branch for updates
$ git checkout master
Tell git who you are
$ git config user.name "Your name"
$ git config user.email mail at example.org
Work as usual, then commit
$ git commit -a -m "changelog message"
Tag a new release
$ git tag iso-codes/3.4
Merge release into debian branch and create a new debian release
$ git checkout debian
$ git merge master
$ dch
$ git commit -a -m "new debian release"
$ git tag debian/3.4-1

Regards,
Tobias

-- 
Tobias Quathamer | "A man's only as old as the woman he feels."
Hamburg, Germany |   -- Groucho Marx
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part.
Url : http://lists.alioth.debian.org/pipermail/pkg-isocodes-devel/attachments/20080829/85faa045/attachment.pgp