[OT] Git, Debian and development against xserver (intel driver)

[Paul Menzel]

Dear everyone (probably more Debian developers),


I am not posting this to the Git mailing list, because I think the
question does more deal with the workflow of the Debian sources(?).

I have some patches against xf86-video-intel 2.3.2, which is the version
in Debian Lenny. Ultimately these should be integrated upstream, so
probably in version 2.7.0.

The developer of the patch is using Debian Lenny and therefore it would
be convenient to be able to build always a Debian package to be able to
test the patches.

My question is: “How is your repository setup?” or “How do you do
this?”.

The Debian Git repository is available [1] and of course the xorg one
too [2].

1. One suggestion I got was to do the following.

git init
git remote add xorg git://anongit.freedesktop.org/xorg/driver/xf86-video-intel
git remote add debian
git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-intel
git fetch debian ; git fetch --tags debian
git fetch xorg ; git fetch --tags xorg
# there are some minor discrepancies between the tags
git br frc-patch xorg/master
git br frc-debian-lenny debian/debian-lenny
# publish the branches on a server

Then develop against one branch (probably debian-lenny the patches are
based on) and cherry-pick them into master.

2. One other way is to only use the Debian Git repository because it
tracks the xorg branches.

git clone git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-intel
git checkout --track origin/upstream-lenny
# apply patches against upstream-lenny
git checkout --track origin/debian-lenny
git merge upstream-lenny # rebase does not work
# adapt a Debian specific patch
# publish the branches on a server

3. Or would it be better to directly develop against debian-lenny?

Debian developers, is debian-lenny based on upstream-lenny and how to
update debian-lenny. Using rebase, merge or cherry-pick?


Sorry for this kind of post. But I am no Git expert, so any advice is
much appreciated.


Thanks,

Paul


[1] http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-intel.git
[2] http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 197 bytes
Desc: Dies ist ein digital signierter Nachrichtenteil
URL: <http://lists.x.org/archives/xorg/attachments/20090422/ba341b25/attachment.pgp>