16:37:47 test>svn co svn://marvin/test/bikeshed
Checked out revision 355.

16:38:01 test>mkdir bikeshed\trunk

16:38:09 test>svn add bikeshed\trunk
A         bikeshed\trunk

16:38:15 test>notepad bikeshed\trunk\paint.colour

16:38:45 test>svn add bikeshed\trunk\paint.colour
A         bikeshed\trunk\paint.colour

16:38:58 test>svn ci -m "" bikeshed
Adding         bikeshed\trunk
Adding         bikeshed\trunk\paint.colour
Transmitting file data .
Committed revision 356.

16:39:11 test>svn cp bikeshed\trunk bikeshed\branch
A         bikeshed\branch

16:39:55 test>notepad bikeshed\branch\brush.type

16:40:51 test>svn add bikeshed\branch\brush.type
A         bikeshed\branch\brush.type

16:41:05 test>svn ci -m "" bikeshed
Adding         bikeshed\branch
Adding         bikeshed\branch\brush.type
Transmitting file data .
Committed revision 357.

16:41:26 test>notepad bikeshed\trunk\roof.composition

16:46:00 test>svn add bikeshed\trunk\roof.composition
A         bikeshed\trunk\roof.composition

16:46:16 test>svn ci -m "" bikeshed
Adding         bikeshed\trunk\roof.composition
Transmitting file data .
Committed revision 358.

16:46:19 test>svn rm bikeshed\trunk\paint.colour
D         bikeshed\trunk\paint.colour

16:46:52 test>svn ci -m "" bikeshed
Deleting       bikeshed\trunk\paint.colour

Committed revision 359.

16:47:08 test>svn merge -r 356:359 svn://marvin/test/bikeshed/trunk bikeshed/branch
D    bikeshed\branch\paint.colour
A    bikeshed\branch\roof.composition

16:48:12 test>svn ci -m "" bikeshed
Deleting       bikeshed\branch\paint.colour
Adding         bikeshed\branch\roof.composition

Committed revision 360.

16:48:31 test>svn merge -r 357:360 svn://marvin/test/bikeshed/branch bikeshed/trunk
Skipped missing target: 'bikeshed\trunk\paint.colour'
A    bikeshed\trunk\roof.composition

16:49:01 test>