你的位置:首页 > 操作系统

[操作系统]svn 日志版本回滚


[root@v01 online]# svn diff -r 9:8Index: index.html===================================================================--- index.html	(revision 9)+++ index.html	(revision 8)@@ -10,4 +10,3 @@ kkkkkkkkkkk kkkkkkkk ggggggg-10[root@v01 online]# svn merge -r 9:8 ""--- Reverse-merging r9 into '.':U  index.html[root@v01 online]# cat index.html <<<<<<< .minekkkkk2222kkkkkllll=======99999988888889999999999999>>>>>>> .r5kkkkkkkkkkkkkkkkkkkggggggg[root@v01 online]# svn diff “”Index: index.html===================================================================--- index.html	(revision 9)+++ index.html	(working copy)@@ -10,4 +10,3 @@ kkkkkkkkkkk kkkkkkkk ggggggg-10[root@v01 online]# svn commit -m "sss"Sending    index.htmlTransmitting file data .Committed revision 10.[root@v01 online]# svn log index.html ------------------------------------------------------------------------r10 | user001 | 2016-05-10 03:02:21 +0800 (Tue, 10 May 2016) | 1 linesss------------------------------------------------------------------------r9 | user001 | 2016-05-10 02:20:13 +0800 (Tue, 10 May 2016) | 1 line------------------------------------------------------------------------r8 | user001 | 2016-05-10 02:13:37 +0800 (Tue, 10 May 2016) | 1 line------------------------------------------------------------------------r7 | user001 | 2016-05-10 01:54:53 +0800 (Tue, 10 May 2016) | 1 line------------------------------------------------------------------------r6 | user001 | 2016-05-10 01:53:49 +0800 (Tue, 10 May 2016) | 1 line------------------------------------------------------------------------r4 | user001 | 2016-05-10 01:27:00 +0800 (Tue, 10 May 2016) | 1 line------------------------------------------------------------------------r3 | user001 | 2016-05-10 01:21:36 +0800 (Tue, 10 May 2016) | 1 line------------------------------------------------------------------------r2 | user001 | 2016-05-09 19:48:15 +0800 (Mon, 09 May 2016) | 1 lineadd test file for mytest------------------------------------------------------------------------r1 | user001 | 2016-05-09 13:19:28 +0800 (Mon, 09 May 2016) | 1 line------------------------------------------------------------------------[root@v01 online]#