[svk-users] binary file smerge issue

[Tim]

hi, 
    I use svk-v2.0.2-MSWin32-x86. I suffer from one binary file smerge issue.
the binary file is a word or pdf file. when I smerge //local to //mirror, system 
find Conflict ,  I want to the third people to resolve the conflict, so I want SVN server to keep my local file .
hence, the third people can get the 2 conflict file from SVN. so I need select 'y' or 't', it goes.
but when I checkout the file from SVN directly, the file was destroyed. SDK Change Log.doc can not be opened.








below is my information:

C:\Documents and Settings\admin>svk smerge //mylocal/version //mirror/version -C

Auto-merging (0, 102) /mylocal/version to /mirror/version (base /mirror/version:
99).
Checking locally against mirror source http://192.168.0.177/version.
U   SDK1/Doc/SDK Change Log.doc
New merge ticket: bd2b22b9-9e66-3647-8ebe-8e12ebcbd7cd:/mylocal/version:102

C:\Documents and Settings\admin>svk smerge //mylocal/version //mirror/version
Auto-merging (0, 102) /mylocal/version to /mirror/version (base /mirror/version:
99).
Waiting for editor...
Merging back to mirror source http://192.168.0.177/version.
Merge conflict during commit: Your file or directory 'SDK1\Doc\SDK Change Log.do
c' is probably out-of-date: The version resource does not correspond to the reso
urce within the transaction.  Either the requested version resource is out of da
te (needs to be updated), or the requested version resource is newer than the tr
ansaction root (restart the commit).
Please sync mirrored path /mirror/version first.
Commit message saved in svk-commitZZ5k7.tmp.

C:\Documents and Settings\admin>svk sync //mirror/version
Syncing http://192.168.0.177/version
Retrieving log information from 47 to 47
Committed revision 103 from revision 47.

C:\Documents and Settings\admin>svk smerge //mylocal/version //mirror/version
Auto-merging (0, 102) /mylocal/version to /mirror/version (base /mirror/version:
99).
Waiting for editor...
Merging back to mirror source http://192.168.0.177/version.
Conflict found in SDK1/Doc/SDK Change Log.doc:
e)dit, d)iff, m)erge, s)kip, t)heirs, y)ours, h)elp? [e] t
G   SDK1/Doc/SDK Change Log.doc
New merge ticket: bd2b22b9-9e66-3647-8ebe-8e12ebcbd7cd:/mylocal/version:102
Merge back committed as revision 48.
Syncing http://192.168.0.177/version
Retrieving log information from 48 to 48
Committed revision 104 from revision 48.

C:\Documents and Settings\admin>svk smerge //mylocal/version //mirror/version
Auto-merging (102, 102) /mylocal/version to /mirror/version (base /mylocal/versi
on:102).
Empty merge.

C:\Documents and Settings\admin>svk smerge //mirror/version //mirror/version
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.bestpractical.com/pipermail/svk-users/attachments/20080728/60e567a6/attachment.htm