rendered paste body[root@mythtv trunk]# svn status
[root@mythtv trunk]# svn info
Path: .
URL: file:///tmp/st/myproj/trunk
Repository UUID: 7d00302f-59f8-0310-93ec-9d0871b54022
Revision: 9
Node Kind: directory
Schedule: normal
Last Changed Author: root
Last Changed Rev: 8
Last Changed Date: 2005-05-30 14:21:23 -0700 (Mon, 30 May 2005)
[root@mythtv trunk]# vi file_c
[root@mythtv trunk]# svn ci -m "changed file c in trunk only, new functionality etc"
Sending file_c
Transmitting file data .svn
Committed revision 10.
[root@mythtv trunk]# svn update
At revision 10.
[root@mythtv trunk]# svn merge -r7:9 file:///tmp/st/myproj/rel/1.1 -m "MERGE: 7:9 from rel/1.1 in to trunk"
Subcommand 'merge' doesn't accept option '-m [--message] arg'
Type 'svn help merge' for usage.
[root@mythtv trunk]# svn merge -r7:9 file:///tmp/st/myproj/rel/1.1
U file_b
[root@mythtv trunk]# svn ci -m "MERGE: 7:9 from rel/1.1 in to trunk"
Sending file_b
Transmitting file data .
Committed revision 11.
[root@mythtv trunk]# svn update
At revision 11.
[root@mythtv trunk]# svn log
------------------------------------------------------------------------
r11 | root | 2005-05-30 14:32:41 -0700 (Mon, 30 May 2005) | 1 line
MERGE: 7:9 from rel/1.1 in to trunk
------------------------------------------------------------------------
r10 | root | 2005-05-30 14:31:21 -0700 (Mon, 30 May 2005) | 1 line
changed file c in trunk only, new functionality etc
------------------------------------------------------------------------
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]#