发布于

宝宝语录-扭蛋

2018.11.29
迪斯尼扭蛋机
宝宝：“妈妈我要米奇”
妈妈：“扭蛋机，放进钱，一转就出来个蛋，里面有什么，妈妈也不知道呀”
宝宝：“是要孵出来才知道吗”
我笑死

​

发布于

GIT和SVN命令对照表

Git Subversion Mercurial
git add <file> svn add <file> (only if the file is not tracked yet) hg add <new_file> (only if the file is not tracked yet)
git blame <file> svn blame <file> hg blame <file>
git show <rev>:<file> svn cat -r <rev> <file> hg cat -r <rev> <file>
git clone <URL> <target_name> svn checkout <URL> <target_name> hg clone <URL> <target_name>
git commit -a svn commit hg commit
git rm <file> svn delete <file> hg rm <file>
git diff <file> svn diff <file> hg diff <file>
git show HEAD:<directory> svn list <directory> hg cat -r rev <directory>
git merge svn merge hg merge
git checkout <file or directory> svn revert <file or directory> hg revert <file or directory>
git checkout HEAD svn switch <url> or svn revert <file> hg update tip
git checkout <branch> svn switch <url> hg update <branch>
git status svn status hg status
git pull svn update hg pull -u
git init svnadmin create hg init .
git fetch svn update hg pull
git reset –hard svn checkout -r <revision> url://path/to/repo hg revert -a –no-backup
git stash No equivalent, may be released in SVN 1.10?, possibly in 2017 hg shelve
git revert <commit_hash|tag|branch_name> svn merge -r UPREV:LOWREV . undo range hg backout <changeset_num|changeset_hash|tag>
svn merge -c -REV . undo single revision
发布于

看ST：TNG最唏嘘的一集

看ST：TNG看到S7-EP15了。没想到这是让我觉得最悲伤最让我唏嘘的一集

一个曾经有不良前科的Bajoran女少尉Sito Jaxa（不是之前的那个），被舰长锻炼，最后认清自我鼓起勇气，与一个Cadassian的间谍一起执行任务，然而悲剧地逃离失败被Cadassian人杀死。描写了太多他们的平时的舰上生活，反而觉得死的可惜，和前期Tasha这样整天出生入死做外勤的感觉完全不同。

哎，总觉得编剧是故意要她死，这种任务根本没必要送死嘛。

发布于

如何清理三星9100的系统日志

如何清理三星9100的系统日志
用手机拨打如下代码： *#9900#
即：星号，井号，9900，井号
选择“Delete dumpstate/logcat”
日志文件在/data/log目录下，通过KinRoot或其他手机助手获得root后，安装ES文件浏览器来删除该目录下全部文本文件

发布于

Yamato/Arcadia 1/60 VF-1 爆肩统计

# Yamato (and Arcadia) V2 1/60 VF-1 Toy Releases
# as compiled by http://anymoon.com/blog/?p=4599

Maker Product Release(?) Price Ver. Durability
YAMATO VF-1S strike Roy Focker custom 06/2008 12,800 2.0 Avoid
YAMATO VF-1S Roy Focker custom 07/2008 9,800 2.0 Avoid
YAMATO VF-1A Hikaru Ichijo custom super / strike 08/2008 12,800 2.0 Avoid
YAMATO VF-1A Hikaru Ichijo custom 09/2008 9,800 2.0 Avoid
YAMATO VF-1J Hikaru Ichijo custom with super 10/2008 12,800 2.0 Avoid
YAMATO VF-1J Hikaru Ichijo custom 12/2008 9,800 2.0 Avoid
YAMATO VF-1S Hikaru Ichijo custom super / strike 12/2008 12,800 2.0 Avoid
YAMATO VF-1S Hikaru Ichijo custom 01/2009 9,800 2.0 Avoid
YAMATO VF-1D Trainer 02/2009 9,800 2.0 Safe
YAMATO VF-1S Maximillian Jenius custom 04/2009 9,800 2.0 Safe
YAMATO VF-1A Maximillian TV custom 04/2009 9,800 2.0 Safe
YAMATO VF-1A Maximillian DRYL custom 05/2009 9,800 2.0 Safe
YAMATO VF-1A Hayao TV custom 05/2009 9,800 2.0 Safe
YAMATO VF-1A Hayao DYRL custom 05/2009 9,800 2.0 Safe
YAMATO VF-1J Mass production type 06/2009 9,800 2.0 Safe
YAMATO VF-1S Maximillian custom weathering 04/2009 15,540 2.0 Safe
YAMATO VF-1A TV Mass production type 07/2009 9,800 2.0 Safe
YAMATO VT-1 Super Ostrich 09/2009 15,800 2.1 Avoid
YAMATO VE-1 Elintseeker 09/2009 16,800 2.1 Safe
YAMATO VF-1S Roy Focker custom LowVis 09/2009 9,800 2.1 Safe
YAMATO VF-1D Virgin Road 09/2009 9,800 2.1 Safe *
YAMATO VF-1J Miria Jenius custom super parts 10/2009 12,800 2.1 Safe *
YAMATO VF-1J Maximillian custom super parts 10/2009 12,800 2.1 Safe *
YAMATO VF-1J Hikaru Ichijo custom weathering 11/2009 ? 15,540 2.0 Avoid
YAMATO VF-1S Roy Anniversary super / strike + flashlight 12/2009 12,800 2.0 Safe
YAMATO VF-1S Hikaru Anniversary super / strike + flashlight 12/2009 12,800 2.0 Safe
YAMATO VF-1J Hikaru custom with armor parts 12/2009 16,800 2.0 Avoid **
YAMATO VF-1S No Painting ver 12/2009 8,295 2.05 Safe
YAMATO VF-1S No Painting ver, unassembled 12/2009 6,090 2.05 Safe
YAMATO VF-1S Roy Focker custom weathering 01/2010 15,540 2.0 Safe
YAMATO VF-1J Hikaru Ichijo custom 05/2010 9,800 2.2 Safe
YAMATO VF-1S Roy Focker custom TV 06/2010 9,800 2.2 Safe
YAMATO VF-1S Hikaru Ichijo custom TV super / strike 06/2010 12,800 2.2 Safe
YAMATO VF-1A Maximillian DYRL custom super/strike 09/2010 12,800 2.2 Safe
YAMATO VF-1A Hayao DYRL customsuper / strike 09/2010 12,800 2.2 Safe
YAMATO VF-1A Maximillian DYRL custom weathering 10/2010 15,400 2.2 Safe
YAMATO VF-1A Hayao DYRL custom weathering 10/2010 15,400 2.2 Safe
YAMATO VF-1A Angelbirds custom Macross Chronicles 12/2010 16,500 2.2 Safe
YAMATO VF-X Test custom Macross Chronicles 12/2010 14,500 2.2 Safe
YAMATO VF-1J Hikaru Ichijo custom with armor parts 12/2010 16,800 2.2 Safe
YAMATO VF-1J Hikaru Ichijo custom Gray Visor 12/2010 9,800 2.2 Safe
YAMATO VF-1A Maximillian TV custom 04/2011 ? 9,800 2.2 Safe
YAMATO VF-1A Hayao TV custom 05/2011 ? 9,800 2.2 Safe
YAMATO VF-1A TV Mass production type 07/2011 ? 9,800 2.2 Safe
YAMATO VF-1A No Painting ver; unassembled + option parts 11/2011 6,825 2.2 Safe
YAMATO VF-1J No Painting ver, unassembled + option parts 11/2011 6,825 2.2 Safe
YAMATO VF-1S No Painting ver, unassembled + option parts 11/2011 6,825 2.2 Safe
YAMATO VF-1D + option parts (Ver.30th) 04/2012 10,290 2.2 Safe
YAMATO VF-1A Calvaliers squadron custom (Ver.30th) 07/2012 10,290 2.2 Safe
YAMATO VF-1J Hikaru Ichijo custom + option parts (Ver.30th) 05/2012 10,290 2.2 Safe
YAMATO VF-1S Roy Focker custom TV + option parts (Ver.30th) 05/2012 10,290 2.2 Safe
YAMATO VF-1D No Painting ver, unassembled + option parts (Ver.30th) 05/2012 7,140 2.2 Safe
YAMATO VF-1A DYRL Mass production type + option parts (Ver.30th) 07/2012 10,290 2.2 Safe
YAMATO VF-1S Roy Focker custom + option parts (Ver.30th) 07/2012 10,290 2.2 Safe
YAMATO VF-1S Hikaru Ichijo custom + option parts (Ver.30th) 07/2012 10,290 2.2 Safe
YAMATO VE-1 Elintseeker + option parts (Ver.30th) 11/2012 17,640 2.2 Safe
YAMATO Accessory – DYRL super & strike parts 07/2008 3,990 – –
YAMATO Accessory – TV super parts 12/2008 3,990 – –
YAMATO Accessory – DYRL super & strike parts weathering 07/2008 6,090 – –
YAMATO Accessory – GBP- 1S armor (with missile launch effe 12/2010 9,800 – –
YAMATO Accessory – GBP-1S armor parts for VF-1 Valyrie 04/2011 6,800 – –
YAMATO Accessory – Clear parts 07/2009 1,500 – –
YAMATO Accessory – Zentran outfit 12/2010 8,259 – –
YAMATO Accessory – Photo etch parts for unassembled valkyr 02/2011 1,260 – –
YAMATO Accessory – DYRL super & strike parts + option part (Ver.30th) 11/2012 5,040 – –
ARCADIA VF-1J 30th Anniversary + basic stand + option parts 08/2013 15,800 2.2 Safe
ARCADIA VF-1S DYRL Roy Focker custom + stand & option 11/2015 16,800 2.2 Safe
ARCADIA VF-1S DYRL Hikaru Ichijo custom + stand & option 12/2013 16,800 2.2 Safe
ARCADIA VF-1J Hikaru Ichijo custom + GBP 05/2015 23,800 2.2 Safe
ARCADIA VF-1S DYRL Roy Focker custom + super/strike & opiton 08/2016 21,800 2.2 Safe

* With caveats, see Durability & Build Section
** The reissue in the exact same box is safe. . . look for a set WITHOUT the 1 painted on the GBP’s chest.

Version Key:
Version 2.0: Original version 2 releases. Feature a tinted canopy and a new type of crotch locking mechanism for battroid mode. （版本2.0，舱盖彩虹镀膜，胯部锁扣较窄）
Version 2.05: These toys feature a clear canopy and the crotch locking mechanism found on the 2.0 toy. （版本2.05，舱盖透明，胯部锁扣同2.0）
Version 2.1: Feature a tinted canopy and a similar crotch mechanism to that found on Yamato’s 1/48 line of VF-1 toys. （版本2.1，舱盖彩虹镀膜，胯部锁扣同1/48比例）
Version 2.2: These toys feature a clear canopy and the 1/48 style of crotch locking mechanism. （版本2.2，舱盖透明，胯部锁扣同1/48比例）
Note: I do not own every single V2 release. If I mislabel a release here according to the structure I’ve provided above, please let me know. Also, the anniversary version of the VF-1S toys (Hikaru and Roy) feature little flashlights which some may feel make them more of a collectible. （一周年版VF-1S附赠小手电筒）

Version 30th: 该30周年版在盒子一角上印有30周年纪念蓝色标签，并带有座椅和肋部补件

# ocr by http://www.newocr.com/
# edited by http://www.icaolei.com/

发布于

杂谈

不知道上海历史的人都喜欢大放厥词

身为一个浦东土著我总是很无奈，上海市区人总是被狭隘地当作典型上海人，虽然被称为本地人，但是作为上海本地人确也没什么话语权，难道本地人都太低调了？
上海历史上有3波大规模移民
第一次是宋室南迁到元为止，明清长期没什么大变化
第二次是租界开埠开始，太平天国运动乱世，直到49年解放
第三次是改革开放后持续到现在，自称的“新上海人”

发布于

尺码对照表

美国 英国 欧洲 日本 中国 CM
5 3 35 22 35 22.1
5.5 3.5 35.5 22.5 35.5 22.4
6 4 36 23 36 22.9
6.5 4.5 36.5 23.5 36.5 23.3
7 5 37 23.5 37 23.7
7.5 5.5 37.5 24 37.5 24.1
8 6 38 24.5 38 24.6
8.5 6.5 38.5 25 38.5 24.9
9 7 39 25.5 39 25.4
9.5 7.5 39.5 26 39.5 25.9
10 8 40 26 40 26.2
10.5 8.5 40.5 26.5 40.5 26.7
11 9 41 27 41 27.1
发布于

浦东曹姓2

早在唐代，上海地区就有曹氏定居，今金山亭林出土过唐“限州司仓支令问妻曹夫人”墓碑。据史志谱牒中的迁移记载，宋宣和年间，曹景修自永嘉迁贞溪（今青浦小蒸）。南宋建炎年间，宋初名将曹彬后人扈从康王南渡者18房，其中一支定居今松江广富林，一支定居于锦溪（今上海龙华），一支居于嘉定。嘉定支于明中叶由曹孟春分迁上海。另有一支曹绅定居句容，后人向吴县、常熟幅射，元至正年间，有从常熟再迁崇明；明宣德年间，吴县分支从洞庭东山转迁崇明。此外，元代，有一支曹氏自开封迁上海吴淞江畔；明隆庆、万历年间，又一支曹氏从安徽歙县迁居上海西北郊（今曹家渡）。应该说，他们的来龙去脉是较清楚的。

 

曹姓，宋宣和年间，永嘉曹景修迁贞溪。南宋初，多支南渡入沪，分居锦溪、青龙镇等，其中宋初名将曹彬后人分迁广富林（今松江辰山）、嘉定、上海范家浜西等。明中叶，嘉定支曹孟春迁上海，范家浜支迁浦东。元至正年间和明宣德年间，常熟和吴县东山两支先后迁崇明。http://www.shobserver.com/news/detail?id=54189

我老祖宗在上海的脉络很清晰啊，范家浜就是今天的曹家渡，然后迁到了浦东曹家弄（就是今天的周浦镇），后代又到了南汇，于是挖了条曹家沟（现在仍然存在，斜贯浦东），当今曹姓后代多住在川沙曹路龚路 ：）