过去猴哥一直使用SVN来实现版本控制，在一位不愿意公开姓名的同学的建议下，猴哥尝试使用Git。其主要原因在于Git可以离线提交，并且能够较好地处理冲突问题。

猴哥于是尝试把手头上正在做的NP-Carlo项目从SVN转换到Git，没想到遇到了不小的麻烦。之前正是由于SVN必须联网提交，NP-Carlo半年来一直没有提交，因此版本控制系统的很多信息都是不正确的，校验这些信息花了猴哥很长时间。尤其是其中将某个目录进行拷贝的过程，导致SVN认为他们是同一个目录的不同工作拷贝，但实际上猴哥是想在同一份工作拷贝中，将一个目录复制成两个——结果就出了这样的麻烦。

在删除了新的拷贝中所有的“.svn”文件以后，SVN的数据终于正确了，然后猴哥将数据最后一次提交，在从托管商那里dump下来了代码仓库，挂在本地的SVN服务器上。

按照教程来说，直接使用下面的语句就可以了。猴哥的电脑可能是因为上一次的程序没有运行完，执行下面的语句后一直没有反应。

$ git svn clone svn://localhost --no-meta -s carlo

重新启动以后，再运行上面的代码就可以了。TortoiseGit也有类似的Git Clone功能，但是如果从本地的工作拷贝导入，会出现一些奇怪的问题。所以猴哥使用了本地的SVN服务器导入。

猴哥其实使用版本控制系统也不多，SVN使用目录来区分trunk、branches、tags；可是Git不是，如果要修改某一个分支，则需要重新checkout来进行切换。刚刚完成导入以后，猴哥郁闷的发现工作目录里只有trunk里面的东西了。

经过猴哥的考虑，仅仅将NP-Carlo核心的一个目录作为trunk导入，其他的内容由于不是本项目的内容，而不再进行版本控制。

经过如此的调整，NP-Carlo项目的工作目录就整洁多了，但是版本号从13变回到了1，这还不包括由于前面说的网络问题，trunk里面一直没有提交的若干次修订。

Git进行软件开发是很不错的，因为其可以为每一段代码追溯来源、进行合并和拆分，但猴哥不打算把所有的版本控制目录都改为Git，特别是即将进行的美国数学建模竞赛中，猴哥依然打算使用SVN，因为Git似乎不适合非代码的东西。

在转换的过程中，猴哥发现了一些不错的书籍（ProGit、SVNBook），打算有机会好好看一看，搞明白版本控制系统的用法。

Revision control, also known as version control and source control (and an aspect of software configuration management or SCM), is the management of changes to documents, programs, large web sites and other information stored as computer files. It is most commonly used in software development, where a teamof people may change the same files. For the Monkey, it is used to manage the codes and do the team-work.

The Monkey used to code with SVN, which is one of the popular revision control system. With the suggestion from a person who does not want to publish his name, the Monkey decided to  turn to Git, in which the Monkey can commit without the Internet connection.

The Monkey would like to switch the NP-Carlo project from SVN into Git. Because of the requirement of Internet connection when commit, the Monkey had not committed the modifications of NP-Carlo for quite a long time. So, the working copy came to very dirty. Especially the new folder, which was cloned by the monkey, was incorrectly treated as the original folder rather than a new folder. The Monkey spent a long time to solve the problem by deleting all the ".svn" meta-data.

According to the book, the following command would migrate the code into Git. However, the Monkey's computer might not finish its previous task. The command went to irresponsible.

$ git svn clone svn://localhost --no-meta -s carlo

After rebooting, the command above worked for the Monkey. But the cloned folder made the Monkey anxious, in which there was only files in the trunk of SVN working copy. The Monkey realized that Git does not use folders to divide the trunk and branches — the working copy should be re-checkout if the Monkey wants to switch into a branch!

To make the working copy tidy, the Monkey only imported the Carlo folder into Git, and deleted others, which were not in the project, but just for debugging, from the revision control.  After that, the reversion number turned back from 13 to 1, which were not included the uncommitted modifications because of the connection.

Git is good, but the Monkey does not want to switch everything into Git, especially the coming MCM paper. Because the Git may not suit for the non-code stuff.

During the converting, the Monkey found some good books (ProGit, SVNBook), which are worth reading to understand the revision control.

The English version of this post is not available.

我认为在大学衡量一个人是否成功，不在成绩，而在于是否学会-->这也是我奋斗的目标。

我觉得该说的别的同学会说，不该说的也会有人说，所以我说一下其他人可能不说的。

• 早睡早起；
• 吃好早餐；
• 多运动-->健康的体魄；
• 有问题要及时问老师-->当天上午数分课问问题的同学。

距离上次写日志已经过去了两个月，不是不想写，而是确实太忙了。转眼就从开学的兴奋掉进了忙碌，再走到了本学期的中点，从这一天开始，各种考试将陆续到来。

算法协会

经过各种，我加入了期盼已久软件学院创新基地，结果后来又因为时间安排不过来，主动放弃了。说是退出了，却还是怎么也割舍不下我热爱的算法领域研究。
其实我挺羡慕软件学院能有这么好的一个创新平台，我组织研讨组、组织讨论会，目的就是有这样一个群有着共同爱好的人，围着一个共同的兴趣而奋斗。可我却还是退出了，真是有点割舍不下。真不知道为了一个开放实验放弃我的兴趣，到底值不值。

讹传

数学建模比赛被上报到全国组委会参加全国评奖了，这本来是件好事，可是各种宣传就来了，有的说我拿了“全国一等奖”，有的说我拿了“全国二等奖”，更有甚者都说我“可以保研”了……其实上报上去最坏的结果是有可能被降级成北京市级奖的。

责任

周五的基础课表彰大会上，李副校长讲得话给我的触动很大，我回想起了在四中的时候，常说的几句口号“做杰出的中国人”、“明日四中以我为荣”、“每天锻炼一小时，为祖国健康工作五十年”，作为一名大学生我深感肩上的责任，却又为自己知识的匮乏、能力的局限而感到汗颜。

学霸•不正常的学霸

有件事情给我触动很大，我通过一个偶然的机会得知0581专业11级的孩子们把我称为“学霸”，学霸的意思是[1]指某些学术权威者。一些利用自己在该学术上的声望，而进行打压异己、把持整个学术界、破坏学术界研究氛围的人（贬义）；[2]专注于学习，很少参加社工活动，分数很高的学生（中性义）。

我觉得这些孩子们可能是想使用第二个意项，但实际上我的分数在全校看来不算高，或者上个学期看来也不算高；我也经常参加社会工作活动。有的时候人就是一种思维定势，发生在别的地方的事情爱往自己身边的人上套用，就像四中最近所谓的“罢饭”事件一样。

把我称作学霸，我虽然不愿意，但我还可以理解——毕竟除了迎新和社团活动，这些孩子们基本没有与我接触过，听到的关于我的东西也都是传说，但是他们还在“学霸”二字前面加了一个让我无法忍受的定语“不正常的”。难道成绩好的人就应该被称为“学霸”吗？难道成绩好又参加社会活动的人，就该被称为“不正常”吗？

意外

除了数学建模的事情以外，最近还出了很多意外。电路分析实验A (ELC05011)第八周开课，教务系统竟然将第一次课放在了最下面，于是我竟然意外地“旷”了一次课！！尽管后来补上了，这依然是不可容忍的事故。

这周三我又把上午一二节课记反了，还好两个课两节都有，跟老师协商了以后，我补上了。

最近攒人品的速率看来很大。

没有成果

忙碌了两个月，我发现自己没有做出什么成果，有的时候没有坚持自己高考后定下的“时刻清楚自己在做什么”的原则，更没有坚持“专时专用”原则，甚至连“课程至上”原则都出现了松动。

是时候反思了。

转型

这个学期开学的时候我都在说转型的这个问题，在这个问题上我是认真的。从发展的角度来看，在转型过程中出现上面的这些问题还可以理解的，也是可以预见到的，但是对于这些问题的处理对转型的成败至关重要。

我所谓的转型，不是学习态度的转变，而是学习方法、研究领域的一次提升，是要站在更高视角上，统筹地更加合理高效地规划。“学习态度”原则、“专时专用”原则是基本点，不可动摇。

一只松鼠看见别的小松鼠在森林里游荡、瞎玩儿，故意通过捡石子装出一副努力捡拾坚果的样子，一遍一遍的往返于巢穴与森林深处，每次经过他的同伴时总要故意的弄出一些动静，好让他的同伴知道他每一次出去玩儿都是“不是在玩儿”。

另一只松鼠在无聊的游荡了几天，或者说玩了几天以后，望着自己空空的巢穴，每天都坐在巢穴边上发呆，想自己为什么前几天没有努力。

再一只松鼠，担心年长的松鼠看见他的巢穴空空的而训他，把别人吃剩下的坚果壳拿来放到自己的巢穴里。

几个星期的时间一晃就过去了，第二只松鼠竟然一直在发呆。第三只松鼠成功地应付过了年长松鼠的检查，获得了年长松树的表扬。

冬天来了，前三只松鼠死了。

Winter is coming. Squirrels are preparing for their food for winter. Three teen squirrels do the work together under help of a senior.

Having seen other teen squirrels are hanging and playing in the forest, one squirrel pretends to collect nuts by collecting stones after playing. Going and returning again and again, he always makes some noisy the draw attentions from his mates to show that he is not for fun every time he gets out.

The second boy plays for several days. Then he looks at his empty house, and is just thinking why he played before rather than work.

The third teen is afraid of the crticizing from the senior, so he collects the husts of nuts.

Time flies awfully fast. The second has spent the days by only THINKING. The third one gets the appreciation from the senior successfully.

Winter comes, and the three squirrels die.

[本网良乡快讯]明日，8月25日2011级新生报到的日子。良乡准备好了！

工作人员正在悬挂横幅。良乡准备好了！

校园内悬挂着彩色气球。良乡准备好了！

迎新现场基础设施已经基本布置完毕。良乡准备好了！

良乡1号公寓水池已经蓄水。良乡准备好了！

工作人员正在进行最后的调试。良乡准备好了。

志愿者服务亭的照明设施已经安装好。良乡准备好了。

校园采取了临时交通管理措施。良乡准备好了。

校门景观设施全面启动。良乡准备好了。

北京理工欢迎你！

新生站——新生报到的第一站。良乡准备好了。

灯光下的校训。良乡准备好了。

学生和家长正在查看良乡校区规划图。良乡准备好了。

夜深了。良乡准备好了。

The classrooms here are called Lecture Theaters or Rooms. There are a lot of multi-media systems in every room, so each lecture can be recorded.

I attended Calculus and Linear Algebra, Fundamental Concepts in Mathematics, Signals and Systems 2 and General Physics B today.

The lecturer of Signals and Systems 2 was so active that he asked students to ANSWER questions. The Calculus and Linear Algebra talked about Mathematical Induction while Fundamental Concepts in Mathematics showed some thermos related to countable / uncountable sets.

There were some interesting things in General Physics B. To show how vibration and wave is, the professor used a long string, which was pined on a wall of the theater. To make all students see him, he turned on the camera, which can follow him automatically.

Lecturers here write notes on papers and show to everyone by projectors, instead of using the traditional chalks. Everything here seems very modern though the theaters are older than the classrooms in Liangxiang Campus of  Beijing Institute of Technology.

After class, professors will upload all the stuffs they write down during classes immediately. It makes the Internet based teaching really work.

I am looking forward to tomorrow's journey in UWA.

最终，我决定去西澳大学旁听一些课程。

这里的教室叫做Lecture Theaters，里面有各种高级的多媒体系统。每节课都可以录制下来。

我今天旁听了“微积分与线性代数”、“数学中的基础概念”、“信号与系统2”和“普通物理B”。

“信号与系统2”的老师很活跃，竟然提问。“微积分与线性代数”则讨论了数学归纳法，而“数学中的基础概念”讲了可列集和不可列集。

“普通物理B”课上有很多有意思的东西：为了展示什么是震动和波，教授使用了一个长长的拴在教室一面墙上的绳子；为了让所有的同学看得见他，他打开了摄像机，这个摄像机竟然能够自动追随他。

这里的老师们把板书写在纸上，再通过投影机让所有人看到，而不是使用传统的粉笔。这里的每一个东西都看起来十分先进，尽管这些教室比北理工良乡校区的教室要老。

课后，教授们会把课上他们写的东西立即传到网上，这让网络教学真正的起到了作用。

非常期待明天的西澳大学之行。

Four weeks have flied away awfully fast. The memory of the first day in Phoenix Academy is still lively.

At the time to graduate,  I want to  thank Charles, Carlo and Felicity, who gave me help to get into Phoenix.

I appreciate the vivid classes from Ineke, Antony, Kevin, Cathy, Andrew and Tom. From speaking to writing, from culture differences to common interests, I have learnt a lot from you.

Then, I would like to thank all my classmates. Thank you for being such nice friends.

I am glad that I have been group mate of the English teachers from Fujian Province in the on-class activities. It also has been please to be friend with German-speaking classmates from Switzerland and Germany.

I believe the memory in Phoenix Academy will never be faded forever.

四个星期过得飞快，第一天到凤凰学院的场景依旧历历在目。

在毕业的时候，我希望对各位帮助过我的人士表示感谢。从文化差异到共同兴趣，我学到了很多。

我还要感谢我的所有同学，感谢你们做这么好的朋友。我很荣幸能够与福建省的英语教师们成为课堂活动的队友，我也非常开心能够成为来自瑞士和德国的同学的朋友。

Today, a Chinese-looked graduated student joined our class. I assumed he was from Hong Kong or Macau because his full name was in Webster's phonetic symbols. But he was too quiet that I had not recognized his accent. I think his experiences here will be very interesting to me.

My new teacher Ineke taught Conditionals in grammar, which were learnt by me in high school. But, if she had not recalled this part of grammar, I would have never found I had forgotten some very important knowledge taught in high school, which might be organized creatively, and had ever made me very proud.

Interested in China, she asked me a lot of questions. From one-child policy to the press freedom, from  the gap between the rich and the poor  to Chinese-style socialism, her questions showed her curiosity to the booming Asian country. She was confused by the fact that I am the only child in my family whereas all the other Chinese in our class have siblings. The 'amazing' answer to her was that when they were born there was not one-child policy.

In the afternoon, Ineke suddenly said "You will leave this Friday? What a pity!" to me, as she had known I would graduate this Friday. She said I was clever, humors ... and  easy to talk with. She said, "Why do not study here for one more week? Our class becomes so lively with you. You have such a nice class and a good teacher here. Why not stay?"

我们今天又换了一个新老师，她来自荷兰，曾经在澳大利亚当过中学英语老师。

她今天教了英语语法的虚拟语气条件句，条件句我高中学过，但是如果不是她今天谈到这部分知识，我不会发现我已经遗忘了一些高中非常重要的知识。

她对中国非常感兴趣，课间问了我很多关于中国的问题。从计划生育政策到言论自由，从贫富差距到中国特色社会主义，她的问题展现了她对这个亚洲新兴国家的好奇。她被我是独生子女而其他中国同学都有兄弟姐妹的这个事实搞糊涂了，而我们给她的“神奇的”答案是，她们出生的时候，中国还没有计划生育政策。

下午，她突然对我说：“你这周五走？太遗憾了！”她说我聪明、幽默、容易交流……她说：“为什么不在这里再待一个星期？因为有你，我们的课堂变得生动起来。你在这里有这么一个不错的班级、好的老师，为什么不待在这里呢？”

This morning, I walked to the first bus stop and the first bus arrived late about 3 minutes. When I arrived the interchange station, I had to go across the busy street at the rush hour and waited at another bus stand in the station.

Unfortunately, I was ONE minute late to arrive at the bus stand, and when I got there, the bus had gone just as the way it came.

The next bus to the school would be about 15 minutes late, which would be another bus line. I have never been to the bus stop I should get off, and to be honest, I lose the sense of direction. Thus, I missed the bus stop...

When I arrived school, I was 30-minutes late, and was not allowed to get into the classroom according to the regulations in school. That will be my first absence since I began my primary school!

I think it will be a lesson that I should not make a very very tight plan, and always anticipate some possible blips on my journey.

这是我第一次在这个城市全程乘坐公交车去学校，这里的公交车依照一个固定的时刻表运行，尽管一些时间点可能是近似的。

今天早上，我走到了第一段行程的公交停靠点，第一段的车晚到了大约3分钟。当我到达换乘站的时候，我需要横穿一条高峰期十分繁忙的大街，在车站内的一个站牌处等车。

遗憾的是，我晚到达站牌了一分钟，车悄悄地走了，没有带走一片云彩……

下一个去学校的车在15分钟以后，是另一条线路，停靠在我从来没去过的一个停靠点，而且说实话我也有一点转向了。因此我下错了车站……

当我到达学校的时候，我已经晚了30分钟，按照学校的规定，我不能进入教室。这将是我从上小学以来第一次缺勤！

我想这将是一个教训：我不应该制定这种非常紧凑的计划，应该经常为一些路途中可能的小波折做好准备。

虽说没有赶上学长们的世纪大逃亡，但我还是在撤离良乡以后去中关村校区见证了传说中的女生比例超标到男生比例超标的蜕变，还去学长们在良乡和中关村的宿舍慰问考察了一番，还跟几个学长在校园里和附近（甚至国家图书馆）溜达了一圈。
不管怎么说，离我回良乡还有不到一个月的时间，好好享受我的假期吧。