{"thread":{"id":"19561","subject":"Git, Debian and development against xf86-video-intel","startedAt":"2009-05-28T14:39:33Z","lastAt":"2009-05-28T14:39:33Z","messageCount":1,"participants":["Paul Menzel"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"114960","messageId":"1243521573.944.170.camel@mattotaupa.wohnung.familie-menzel.net","threadId":"19561","inReplyTo":null,"subject":"Git, Debian and development against xf86-video-intel","fromName":"Paul Menzel","fromEmail":"paulepanter@users.sourceforge.net","sentAt":"2009-05-28T14:39:33Z","receivedAt":"2009-05-28T14:39:33Z","isPatch":false,"sender":{"key":"paulepanter@users.sourceforge.net","avatar":null},"body":"Dear list readers,\n\n\nI sent this message to the xorg list but did not get an answer [3]. I\nadapted this message a little bit.\n\nI have some patches against xf86-video-intel 2.3.2 [4], which is the\nversion in Debian Lenny. Ultimately these should be integrated upstream,\nso probably in version 2.7.x.\n\nThe developer of the patch is using Debian Lenny and therefore it would\nbe convenient to be able to build always a Debian package to be able to\ntest the patches.\n\nMy question is: “How is your repository setup?” or “How do you do\nthis?”.\n\nThe Debian Git repository is available [1] and of course the xorg one\ntoo [2].\n\n*One problem is, that the Debian branch includes some patches in debian/\nwhich do not apply cleanly anymore after changing the Intel sources.\nTherefore it is not so easy to just merge to branches!*\n\n1. One suggestion I got from Tobias Grimm was to do the following.\n\ngit init\ngit remote add xorg git://anongit.freedesktop.org/xorg/driver/xf86-video-intel\ngit remote add debian git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-intel\ngit fetch debian ; git fetch --tags debian\ngit fetch xorg ; git fetch --tags xorg\n# there are some minor discrepancies between the tags\ngit br frc-patch xorg/master\ngit br frc-debian-lenny debian/debian-lenny\n# publish the branches on a server\n\nThen develop against one branch (probably debian-lenny the patches are\nbased on) and cherry-pick them into master.\n\n2. One other way is to only use the Debian Git repository because it\ntracks the xorg branches.\n\ngit clone git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-intel\ngit checkout --track origin/upstream-lenny\n# apply patches against upstream-lenny\ngit checkout --track origin/debian-lenny\ngit merge upstream-lenny # rebase does not work\n# adapt a Debian specific patch\n# publish the branches on a server\n\n3. Or would it be better to directly develop against debian-lenny?\n\n4. What branches should be published? 4? One for upstream version in\nDebian Lenny, one to be ready to build for Debian Lenny, one for latest\nupstream and one adapted for Debian?\n\nSorry for this kind of post. But I am no Git expert, so any advice is\nmuch appreciated. I found this post [5] but because of the\nDebian/distribution specific stuff it did not solve all my questions.\n\n\nThanks,\n\nPaul\n\n\n[1] http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-intel.git\n[2] http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/\n[3] http://lists.freedesktop.org/archives/xorg/2009-April/045279.html\n[4] http://projects.vdr-developer.org/git/?p=xf86-video-intel-frc.git;a=summary\n[5] http://www.gelato.unsw.edu.au/archives/git/0601/15567.html\n"}]}