some idea about cleanup the [tracking_backfire] branch

Xiangfu Liu xiangfu at sharism.cc
Sat Oct 30 11:20:25 EDT 2010


On 10/30/2010 07:59 PM, Mirko Vogt wrote:
> Feel free - however please double-check if everything is fine before
> pushing your changes.
> A short  summary would be nice as well about what changed (or what has
> to be changed in local clones) so developers don't get confused.
> 

Hi Mriko 

I give up the (git rebase -i) :)

so I start to manual create patches. I have created a new branch name [tracking_backfire_xiangfu][1]
it's base on upstream backifre r23044 and I have push those patches to it.

here is the steps I create those patches:
$ git diff backfire package/uboot-xburst/ > ~/patch-openwrt-backfire/001-package-uboot-xburst.patch
$ git diff backfire target/linux/xburst/ >~/patch-openwrt-backfire/002-target-linux-xburst.patch
$ git diff backfire package/ks7010/ > ~/patch-openwrt-backfire/003-package-ks7010.patch

here are some info about the different:
$ git diff backfire > master[cae1615]-backfire[r23044].diff
$ grep "diff \-\-git" master\[cae1615\]-backfire\[r23044\].diff > all-different-files.txt[2]

I have remove the data/, package/uboot-xburst/, target/linux/xburst/, lines in [2].
so for now the all-different-files.txt[2] include all files that should not be in [tracking_backfire]
or [master].

what do you think? I think it's very very hard to remove commit (or rebase) from [tracking_backfire]

there two files I am not push:
	.gitignore		should send to upstream
	feeds.conf.default	should only keep in 'master'

if I forget something just let me know.

[1]http://projects.qi-hardware.com/index.php/p/openwrt-xburst/source/changes/tracking_backfire_xiangfu/
[2]http://www.openmobilefree.net/other/downloads/tmp/backfire-cleanup/all-different-files.txt
[3]http://www.openmobilefree.net/other/downloads/tmp/backfire-cleanup/
-- 
Best Regards
Xiangfu
-- Qi RSS feed, http://en.qi-hardware.com/feed/rss20.xml --
-- Buy NanoNote http://www.nanonote.cc --




More information about the discussion mailing list


interactive