Re: upload of xserver-xorg-video-ivtvdev.git
On Wed, 2007-02-21 at 08:41 +, Ian Campbell wrote: Hi David, I've just pushed a fix for #406032 (FTBFS on a bunch of architectures) to xserver-xorg-video-ivtvdev.git. Thanks to whoever added me to pkg-xorg on alioth which allowed this. Would you mind doing an upload? I don't want to pester but would it be possible to upload the new ivtv X driver? If there's anything I can do to make your life easier please just shout. I'm assuming that it is simply a matter of running git-buildpackage but if you'd prefer me to generate a .diff/.dsc etc and put them somewhere I'd be happy to. Thanks, Ian. -- Ian Campbell It's a trackball for one so it's not a rodent it's a turd with a ball sticking out which you fondle constantly signature.asc Description: This is a digitally signed message part
Re: upload of xserver-xorg-video-ivtvdev.git
On Tue, Feb 27, 2007 at 10:18:45PM +, Ian Campbell wrote: On Wed, 2007-02-21 at 10:57 +0100, Julien Cristau wrote: On Wed, Feb 21, 2007 at 10:23:08 +0100, Peter Baumann wrote: This should work. (But better try it out with a _copy_ of your repo. I ... The way I did it (for xterm) was something like this: ... Thanks guys. I managed to get one of the upstream branches imported ... And for completeness this is how I did import the synaptics driver upstream git repository: - created a new empty local repo: $ git-init-db - pull from my previous local repository to the debian-unstable branch: $ git pull http://git/git/xserver-xorg-input-synaptics.git master:debian-unstable - pull from upstream master branch to local upstream branch: $ git pull http://web.telia.com/~u89404340/touchpad/synaptics/.git master:upstream - I now have 3 branches: $ git branch debian-unstable * master upstream where 'debian-unstable' is my previous repository (with just the debian/ dir), 'upstream' is the clean upstream repo and 'master' is a merge of both. Note: to avoid creating initial confusion execute the 2 pulls above without changing branch (eg: stay on the 'master' branch) - now merge the upstream work into 'debian-unstable' (and this is actually automatic if you switch to the 'debian-unstable' branch after the first pull created it): $ git checkout debian-unstable $ git pull . upstream - here you go, now delete the 'master' branch (optional) and push to alioth: $ git branch -D master $ cat .git/remotes/alioth EOT URL: ssh://alioth.debian.org/git/pkg-xorg/driver/xserver-xorg-input-synaptics.git/ Push: refs/heads/upstream Push: refs/heads/debian-unstable EOT $ git push alioth $ git push --tags alioth - track upstream changes $ cat .git/remotes/upstream EOT URL: http://web.telia.com/~u89404340/touchpad/synaptics/.git/ Pull: refs/heads/master:refs/heads/upstream EOT $ git pull upstream Done (you'll obviously work on the debian-unstable branch) Maybe there's something a little redundant but it works for me (TM). Also you may want to just import the upstream work into your existing repository (not a new empty one), in that case the following may work: $ git checkout -b upstream whatever $ git pull http://web.telia.com/~u89404340/touchpad/synaptics/.git +master:upstream Note the '+' and look at git-pull(1) notes to the refspec format. -- mattia :wq! signature.asc Description: Digital signature
Re: upload of xserver-xorg-video-ivtvdev.git
On Wed, 2007-02-21 at 10:57 +0100, Julien Cristau wrote: On Wed, Feb 21, 2007 at 10:23:08 +0100, Peter Baumann wrote: This should work. (But better try it out with a _copy_ of your repo. I don't know if this is the _correct_ way to do this. If someone knows a quicker/better way, please tell me) cd xserver-xorg-video-ivtvdev git checkout -b upstream # create the upstream branch : .git/refs/heads/upstream # remove the sha1 from the # upstream branch git-ls-files -z|xargs -0 rm # remove every tracked file # now remove everything which is left (objects, ignored files, etc.) rm .git/index # remove the index tar -xvzf upstream.tar.gz # unpack upstream into current directory git add . # add everything git commit The way I did it (for xterm) was something like this: $ git-clone git://git.debian.org/git/pkg-xorg/app/xterm $ tar zxf xterm-223.tar.gz $ cp -a xterm/.git xterm-223/ $ cd xterm-223 $ echo refs/heads/upstream .git/HEAD For the benefit of the archives this should be $ echo ref: refs/heads/upstream .git/HEAD $ rm .git/index $ git-add . $ git-commit This is from my memory, so I may have forgotten a step, but some use of git-status along the way might help you check this :) I guess that also doesn't qualify as a correct way to do it... Thanks guys. I managed to get one of the upstream branches imported using the above. The other upstream is an svn repo which I'd like to launder through git-svn which is going to take a little more experimentation... Cheers, Ian. -- Ian Campbell Fascinating is a word I use for the unexpected. -- Spock, The Squire of Gothos, stardate 2124.5 signature.asc Description: This is a digitally signed message part
upload of xserver-xorg-video-ivtvdev.git
Hi David, I've just pushed a fix for #406032 (FTBFS on a bunch of architectures) to xserver-xorg-video-ivtvdev.git. Thanks to whoever added me to pkg-xorg on alioth which allowed this. Would you mind doing an upload? The repo doesn't seem to have an upstream branch (presumably because upstream isn't x.org). What's the best way to create one do you think? Perhaps something roughly like: git branch upstream rm -rf debian git commit Is there some way to create a completely empty branch rather than one parented off debian-unstable? Then I could just import the pristine upstream source into that and merge it into debian-unstable? The package currently uses a fork of upstream with X.org 7 support but I'm hoping to switch to the svn trunk at some point. Would creating two branches be acceptable/necessary? i.e. upstream-xorg-7-fork and upstream-trunk. I'd quite like to switch the debian-experiment branch over to upstream-trunk. Cheers, Ian. -- Ian Campbell One man tells a falsehood, a hundred repeat it as true. signature.asc Description: This is a digitally signed message part
Re: upload of xserver-xorg-video-ivtvdev.git
Ian Campbell [EMAIL PROTECTED] schrieb: --=-D1gy/51lI0n3bCHCQUe3 Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hi David, I've just pushed a fix for #406032 (FTBFS on a bunch of architectures) to xserver-xorg-video-ivtvdev.git. Thanks to whoever added me to pkg-xorg on alioth which allowed this. Would you mind doing an upload? The repo doesn't seem to have an upstream branch (presumably because upstream isn't x.org). What's the best way to create one do you think? Perhaps something roughly like: git branch upstream rm -rf debian git commit Is there some way to create a completely empty branch rather than one parented off debian-unstable? Then I could just import the pristine upstream source into that and merge it into debian-unstable? The package currently uses a fork of upstream with X.org 7 support but I'm hoping to switch to the svn trunk at some point. Would creating two branches be acceptable/necessary? i.e. upstream-xorg-7-fork and upstream-trunk. I'd quite like to switch the debian-experiment branch over to upstream-trunk. Cheers, Ian. This should work. (But better try it out with a _copy_ of your repo. I don't know if this is the _correct_ way to do this. If someone knows a quicker/better way, please tell me) cd xserver-xorg-video-ivtvdev git checkout -b upstream # create the upstream branch : .git/refs/heads/upstream # remove the sha1 from the # upstream branch git-ls-files -z|xargs -0 rm # remove every tracked file # now remove everything which is left (objects, ignored files, etc.) rm .git/index # remove the index tar -xvzf upstream.tar.gz # unpack upstream into current directory git add . # add everything git commit Merging this branch with any other branch will be a huge pain in the ass, because there is no common commit (merge base). You could expect massive conflicts, but it's just the first merge, after that it should work as expected. Regards, Peter Baumann -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: upload of xserver-xorg-video-ivtvdev.git
On Wed, Feb 21, 2007 at 10:23:08 +0100, Peter Baumann wrote: This should work. (But better try it out with a _copy_ of your repo. I don't know if this is the _correct_ way to do this. If someone knows a quicker/better way, please tell me) cd xserver-xorg-video-ivtvdev git checkout -b upstream# create the upstream branch : .git/refs/heads/upstream # remove the sha1 from the # upstream branch git-ls-files -z|xargs -0 rm # remove every tracked file # now remove everything which is left (objects, ignored files, etc.) rm .git/index # remove the index tar -xvzf upstream.tar.gz # unpack upstream into current directory git add . # add everything git commit The way I did it (for xterm) was something like this: $ git-clone git://git.debian.org/git/pkg-xorg/app/xterm $ tar zxf xterm-223.tar.gz $ cp -a xterm/.git xterm-223/ $ cd xterm-223 $ echo refs/heads/upstream .git/HEAD $ rm .git/index $ git-add . $ git-commit This is from my memory, so I may have forgotten a step, but some use of git-status along the way might help you check this :) I guess that also doesn't qualify as a correct way to do it... Merging this branch with any other branch will be a huge pain in the ass, because there is no common commit (merge base). You could expect massive conflicts, but it's just the first merge, after that it should work as expected. In most cases for the repos so far, it was very easy to merge them with the branches from freedesktop.org (the only problems were because of $Id$ or similar cvs tags), but it's true that if two files are added with different contents in branches that don't share a common commit you'll get conflicts. Doing the first merge with the same upstream release in both branches helps, because then there shouldn't be (m)any files with varying contents. Cheers, Julien -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
