ethan@sundance:~/web/trunk$ svk push
Auto-merging (284, 289) /local/trunk to /mirror/trunk (base /local/trunk:284).
c===> Auto-merging (284, 286) /local/trunk to /mirror/trunk (base /local/trunk:284).
Merging back to mirror source svn+ssh://glasserc@apu.dreamhost.com/home/glasserc/svn/bcrepo.
Enter passphrase for key '/home/ethan/.ssh/id_dsa':
A projects/lockers/intro.mdwn
New merge ticket: f709915a-3650-4852-8cf3-30f336e5c756:/local/trunk:286
Merge back committed as revision 217.
Syncing svn+ssh://glasserc@apu.dreamhost.com/home/glasserc/svn/bcrepo
Retrieving log information from 215 to 217
(in cleanup) Svndiff data ends unexpectedly: Unexpected end of svndiff input
Svndiff data ends unexpectedly: Unexpected end of svndiff input
(in cleanup) Svndiff data ends unexpectedly: Unexpected end of svndiff input
ethan@sundance:~/web/trunk$ svk push
Auto-merging (284, 289) /local/trunk to /mirror/trunk (base /local/trunk:284).
===> Auto-merging (284, 286) /local/trunk to /mirror/trunk (base /local/trunk:284).
Merging back to mirror source svn+ssh://glasserc@apu.dreamhost.com/home/glasserc/svn/bcrepo.
Enter passphrase for key '/home/ethan/.ssh/id_dsa':
A projects/lockers/intro.mdwn
New merge ticket: f709915a-3650-4852-8cf3-30f336e5c756:/local/trunk:286
Item already exists in filesystem: File already exists: filesystem '/home/glasserc/svn/bcrepo/db', transaction '217-1', path '/trunk/projects/lockers/intro.mdwn'
Please sync mirrored path /mirror/trunk first.