June 30th, 2009
I have a project on GitHub. It’s name is django-vcs-watch. Also, I had a test django project in separate directory. This test project was a separate git repository, but today I decided to made it a part of [django-vcs-watch] and include as example project to the main repository at GitHub.
So, I started to search how to merge two git repositories together. And furtunately, I have found the solution. See the comments for this post, where Tobu suggests to use git filter-branch and pulling to get two repositories together.
First, full vcs_test projects content was moved to a new subdirectory example, using this command:
git filter-branch --index-filter 'git ls-files -s | sed "s-\t-&example;/-" |
GIT_INDEX_FILE=$GIT_INDEX_FILE.new \
git update-index --index-info &&
mv $GIT_INDEX_FILE.new $GIT_INDEX_FILE' HEAD
Next, I’m went to the django-vcs-watch directory, and just make a pull:
That’s it! Just one git push, and all changes will go to the GitHub. Hey! They are already there!
Note, that git-filter-branch has other interesting applications. For example, you can split you repository, or remove some unwanted commits. Anyway, this command is very dangerous, don’t try to repeat these experiments at home, or at least, have a backup 
Posted in Uncategorized | No Comments »
June 16th, 2009
you know what. now the Beijing like night.(very dark), but now the time is 11:26 AM,
small rain and lightning.
dark day
Posted in Uncategorized | No Comments »
June 14th, 2009
generate rss from sphpblog,
save to text file, remove CDATA before import to WP due to this item not handled well by WP.
“<![CDATA[”
“]]>”
import RSS from WP Manage/Import/RSS, all posts, categories loaded to WP.
written by dreamark
Posted in Blog | No Comments »
June 12th, 2009
I recently merge the PI's u-boot(1.1.6) to u-boot V2009.06-rc2
we also want put it to upstream.
now the u-boot v2009.06 can init LCD, boot in command line.
Posted in Blog | No Comments »
May 19th, 2009
we just finish the “usb boot tools” linux Version.
that means we can reflash the ingenic device in linux.
I test this code at Ubuntu 9.04. reflash the PI.
it's work
you can find the code at:
http://code.google.com/p/pi-project/source/browse/#svn/trunk/flash-tool
send email to me if you have problem with this program.
—————–
inflash tools: flash image(like u-Boot, kernel) to PI.
to compile this program you need:
On Debian and Ubuntu, you'll need libusb-dev:
“sudo apt-get install libusb-dev libconfuse-dev”
Posted in Blog | No Comments »
April 26th, 2009
* pi-u-boot have merge with jz_hacking
* pi's lcd work under pi-kernel
* pi-u-boot have three branch
[master]
[pi] sucess build u-boot for pi
[xiangfu] I try to merge with the upstream
[1]http://github.com/xiangfu/pi-u-boot/tree/master
[2]http://github.com/xiangfu/pi-kernel/tree/master
Posted in Blog | No Comments »
April 17th, 2009
now the LCD is work in u-boot.
Posted in Blog | No Comments »
April 15th, 2009
it's TP74, the RXD.
Posted in Blog | No Comments »
April 15th, 2009
CPU : Ingenic JZ4740
MEM : 32MB
NAND FLSH : 1GB
DISPLAY : 3' TFT 320×240
–
USB 1.1
MicroSD（MAX 2GB）
MIC
SPEAKER
FULL KEYBOARD
Source code:
http://code.google.com/p/pi-project/
Posted in Blog | No Comments »
April 14th, 2009
(ALL UNDER WINDOWS) but we have plan to develop the Linux version usb boot tool
I have post a picture that show there are two pins can switch boot from nand, boot form USB,
1. short the pins boot from usb.
2. install the Ingenic driver.ftp://ftp.ingenic.cn/3sw/00tools/usb_boot/tools/usbboot1.4a-tools.zip
3. run USB_Boot.exe
4. input “boot 0″ to boot the Pi.
5. input “nprog 0 u-boot-nand.bin 0 0 -n” to flash the u-boot to Pi.
6. input “help” for help
Posted in Blog | No Comments »
;)
;)