Re: upload of xserver-xorg-video-ivtvdev.git
Ian Campbell <ijc@hellion.org.uk> 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
Reply to: