<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<HTML><HEAD>
<META http-equiv=Content-Type content="text/html; charset=gb2312">
<META content="MSHTML 6.00.6000.16674" name=GENERATOR>
<STYLE></STYLE>
</HEAD>
<BODY bgColor=#ffffff>
<DIV><FONT size=2>hi, </FONT></DIV>
<DIV><FONT size=2> I use <FONT size=2>svk-v2.0.2-MSWin32-x86.
I suffer from one binary file smerge issue.</FONT></FONT></DIV>
<DIV><FONT size=2>the binary file is a word or pdf file. when I smerge //local
to //mirror, system </FONT></DIV>
<DIV><FONT size=2>find Conflict ,<EM> </EM>I want to the third people to
resolve the conflict, so I want SVN server to keep my local file .</FONT></DIV>
<DIV><FONT size=2>hence, the third people can get the 2 conflict file from SVN.
so I need select 'y' or 't', it goes.</FONT></DIV>
<DIV><FONT size=2>but when I checkout the file from SVN directly, the file was
destroyed. SDK Change Log.doc can not be opened.</FONT></DIV>
<DIV><FONT size=2></FONT> </DIV>
<DIV><FONT size=2></FONT> </DIV>
<DIV><FONT size=2></FONT> </DIV>
<DIV><FONT size=2></FONT> </DIV>
<DIV><FONT size=2></FONT> </DIV>
<DIV><FONT size=2></FONT> </DIV>
<DIV><FONT size=2></FONT> </DIV>
<DIV><FONT size=2></FONT> </DIV>
<DIV><FONT size=4><STRONG>below is my information:</STRONG></FONT></DIV><FONT
size=2>
<DIV><BR>C:\Documents and Settings\admin>svk smerge //mylocal/version
//mirror/version -C</DIV>
<DIV> </DIV>
<DIV>Auto-merging (0, 102) /mylocal/version to /mirror/version (base
/mirror/version:<BR>99).<BR>Checking locally against mirror source <A
href="http://192.168.0.177/version">http://192.168.0.177/version</A>.<BR>U
SDK1/Doc/SDK Change Log.doc<BR>New merge ticket:
bd2b22b9-9e66-3647-8ebe-8e12ebcbd7cd:/mylocal/version:102</DIV>
<DIV> </DIV>
<DIV>C:\Documents and Settings\admin>svk smerge //mylocal/version
//mirror/version<BR>Auto-merging (0, 102) /mylocal/version to /mirror/version
(base /mirror/version:<BR>99).<BR>Waiting for editor...<BR>Merging back to
mirror source <A
href="http://192.168.0.177/version">http://192.168.0.177/version</A>.<BR>Merge
conflict during commit: Your file or directory 'SDK1\Doc\SDK Change Log.do<BR>c'
is probably out-of-date: The version resource does not correspond to the
reso<BR>urce within the transaction. Either the requested version resource
is out of da<BR>te (needs to be updated), or the requested version resource is
newer than the tr<BR>ansaction root (restart the commit).<BR>Please sync
mirrored path /mirror/version first.<BR>Commit message saved in
svk-commitZZ5k7.tmp.</DIV>
<DIV> </DIV>
<DIV>C:\Documents and Settings\admin>svk sync //mirror/version<BR>Syncing <A
href="http://192.168.0.177/version">http://192.168.0.177/version</A><BR>Retrieving
log information from 47 to 47<BR>Committed revision 103 from revision 47.</DIV>
<DIV> </DIV>
<DIV>C:\Documents and Settings\admin>svk smerge //mylocal/version
//mirror/version<BR>Auto-merging (0, 102) /mylocal/version to /mirror/version
(base /mirror/version:<BR>99).<BR>Waiting for editor...<BR>Merging back to
mirror source <A
href="http://192.168.0.177/version">http://192.168.0.177/version</A>.<BR>Conflict
found in SDK1/Doc/SDK Change Log.doc:<BR>e)dit, d)iff, m)erge, s)kip, t)heirs,
y)ours, h)elp? [e] t<BR>G SDK1/Doc/SDK Change Log.doc<BR>New merge
ticket: bd2b22b9-9e66-3647-8ebe-8e12ebcbd7cd:/mylocal/version:102<BR>Merge back
committed as revision 48.<BR>Syncing <A
href="http://192.168.0.177/version">http://192.168.0.177/version</A><BR>Retrieving
log information from 48 to 48<BR>Committed revision 104 from revision 48.</DIV>
<DIV> </DIV>
<DIV>C:\Documents and Settings\admin>svk smerge //mylocal/version
//mirror/version<BR>Auto-merging (102, 102) /mylocal/version to /mirror/version
(base /mylocal/versi<BR>on:102).<BR>Empty merge.</DIV>
<DIV> </DIV>
<DIV>C:\Documents and Settings\admin>svk smerge //mirror/version
//mirror/version<BR></FONT></DIV></BODY></HTML>