[pkg-fso-maint] I need a DD to upload libfsoresource :-)

[Heiko Stübner]

Hi,

Am Sonntag 14 März 2010 17:41:11 schrieb Sebastian Reichel:
> Btw, how did you (Heiko) extract one of the directories into its
> own branch? I only found git filter branch --subdirectory-filter,
> which can't be updated easily. I guess you used some other method?
this is based on a mail exchange with Joachim from 2009-04-28.

The following contains an example for libfsotransport. Reproducing should be 
as simple as exchanging the branch names and git-hashes with current ones

#######Joachim's mail:

Am Dienstag, den 28.04.2009, 09:35 +0200 schrieb Heiko Stübner:
> # git ls-tree -d HEAD
> 040000 tree 0c9aa01b1bc1d089331c8686352b10f530556e50    docs
> 040000 tree 2165fe7795bb83781cb7636a8aa5e5ba9270ce8c    fsodeviced
> 040000 tree 7bfe3b51fd7ab48d9cdf4f6e7f9d7a46c21eef6c    fsogsmd
> 040000 tree 8587df780829d98f75d1e6e2faa579012c73841e    libfsoframework
> 040000 tree 13c2d8e9d2f99974c914189308921515c86b82a6    libfsotransport
> 
> according to [1] to create an empty branch
> #git symbolic-ref HEAD refs/heads/libfsotransport
> #rm .git/index 
> #git clean -fdx
> 
> #echo "import libfsotransport" | git commit-tree \
> 13c2d8e9d2f99974c914189308921515c86b82a6
> Result: efdb84b74e983be9e0cab7aeb9f732c67e1b0c02

looks good so far

[...]

I think what you need to do here is 
echo efdb84b74e983be9e0cab7aeb9f732c67e1b0c02 >.git/refs/heads/libfsotransport
and then "git checkout libfsotransport".

####### end Joachim's mail

after this you only need

#git merge -s subtree master

for the master -> libfsotransport merge.

Merges from libfsotransport to later branches can use a normal merge. [The 
libfsotransport branch is only my idea to keep a bit space between the 
extracted upstream source and code with automake files in upstream-dist]

Also an initial "git merge -s subtree master" is needed after the last command 
from the quoted mail to get the version history to appear.

Heiko