17:30:19 test>svn co svn://marvin/test/bikeshed Checked out revision 375. 17:30:47 test>mkdir bikeshed\trunk 17:30:52 test>svn add bikeshed\trunk A bikeshed\trunk 17:30:58 test>notepad bikeshed\trunk\paint.colour 17:31:04 test>svn add bikeshed\trunk\paint.colour A bikeshed\trunk\paint.colour 17:31:21 test>svn propset svn:mime-type application/octet-stream bikeshed\trunk\paint.colour property 'svn:mime-type' set on 'bikeshed\trunk\paint.colour' 17:31:28 test>svn ci -m "" bikeshed Adding bikeshed\trunk Adding (bin) bikeshed\trunk\paint.colour Transmitting file data . Committed revision 376. 17:31:38 test>svn cp bikeshed\trunk bikeshed\branch A bikeshed\branch 17:31:57 test>notepad bikeshed\branch\brush.type 17:32:01 test>svn ci -m "" bikeshed Adding bikeshed\branch Committed revision 377. 17:32:29 test>notepad bikeshed\trunk\roof.composition 17:32:34 test>svn add bikeshed\trunk\roof.composition A bikeshed\trunk\roof.composition 17:32:43 test>svn ci -m "" bikeshed Adding bikeshed\trunk\roof.composition Transmitting file data . Committed revision 378. 17:32:51 test>notepad bikeshed\trunk\paint.colour 17:33:01 test>svn ci -m "" bikeshed Sending bikeshed\trunk\paint.colour Transmitting file data . Committed revision 379. 17:33:21 test>svn merge -r 376:379 svn://marvin/test/bikeshed/trunk bikeshed/branch A bikeshed\branch\roof.composition U bikeshed\branch\paint.colour 17:34:02 test>svn ci -m "" bikeshed Sending bikeshed\branch\paint.colour Adding bikeshed\branch\roof.composition Transmitting file data . Committed revision 380. 17:34:26 test>svn merge -r 377:380 svn://marvin/test/bikeshed/branch bikeshed/trunk A bikeshed\trunk\roof.composition C bikeshed\trunk\paint.colour 17:34:53 test>