前一篇文章讲了svn的branch和trunk合并方法,本文会讲更简单的合并方式:
1、切换到branch目录,执行:
svn log > svn.log
找到branch和trunk分开的初始svn版本号:
cat svn.log
.........
.........
------------------------------------------------------------------------
r123399 | liangjun | 2014-07-30 18:21:40 +0800 (Wed, 30 Jul 2014) | 1 line
初始导入。
------------------------------------------------------------------------
r122708 | liangjun | 2014-07-28 10:42:22 +0800 (Mon, 28 Jul 2014) | 1 line
create hdfs raid branch
------------------------------------------------------------------------
r122539 | jiangyu2 | 2014-07-25 15:05:25 +0800 (Fri, 25 Jul 2014) | 1 line
.......
.......