[root@mythtv trunk]# svn merge -r3:7 file:///tmp/st/myproj/rel/1.1 U file_b A file_c [root@mythtv trunk]# svn status M file_b A + file_c [root@mythtv trunk]# svn ci -m "Merged /rel/1.1 in to trunk (using -r3:7)" Sending file_b Adding file_c Transmitting file data . Committed revision 8. [root@mythtv trunk]# svn update At revision 8. [root@mythtv trunk]# ls file_a file_b file_c [root@mythtv trunk]# more file_a this is file a changed for the first time changed again, this should be rev 4? changed one more time, should be 6 now? [root@mythtv trunk]# more file_b this is file b also amended edited in rel/1.1 to change and make this v5? [root@mythtv trunk]# svn log ------------------------------------------------------------------------ r8 | root | 2005-05-30 14:21:23 -0700 (Mon, 30 May 2005) | 1 line Merged /rel/1.1 in to trunk (using -r3:7) ------------------------------------------------------------------------ r6 | root | 2005-05-30 14:11:28 -0700 (Mon, 30 May 2005) | 1 line changed file_a to bump it to 6? ------------------------------------------------------------------------ r4 | root | 2005-05-30 14:07:38 -0700 (Mon, 30 May 2005) | 1 line changed file_a to hopefully create v4? ------------------------------------------------------------------------ r2 | root | 2005-05-30 14:05:54 -0700 (Mon, 30 May 2005) | 1 line Changed file_a and file_b ------------------------------------------------------------------------ r1 | root | 2005-05-30 14:04:00 -0700 (Mon, 30 May 2005) | 1 line Initial import ------------------------------------------------------------------------ [root@mythtv trunk]#