fengyunjh6的专栏

更新到最新例如最新是30找出要回滚的版本号，比如想恢复到20要看看具体信息确保： svn diff -r 30:20 [something]  这里的something可以是文件、目录或整个项目回滚：svn merge -r 30:20 something // 必须加something 再次确认回滚的结果sv

Conflict discovered in 'ram/rfrx_test/avdata.c'.Select: (p) postpone, (df) diff-full, (e) edit,        (mc) mine-conflict, (tc) theirs-conflict,        (s) show all options: df--- /tmp/tempfil

记住一点，diff的时候都是看后面的比前面的做了什么改动不用svn diff 用 diff：例如：2c2---> a30a31,32> b>41d42看的出来 大于号相当于‘+’

Is the new hardware your DVT? According to the latest schedule I got, your PVT is 8/20 and MP is 8/30. Are we still on schedule?