[svk-devel] binary file smerge issue

[Tim]

hi, clkao:
    any clue found on this issue? I expect your headway. thank you!

----- Original Message ----- 
From: "Tim" <leopdong at 163.com>
To: <svk-devel at bestpractical.com>
Cc: <clkao at clkao.org>
Sent: Wednesday, July 30, 2008 2:21 PM
Subject: Re: [svk-devel] binary file smerge issue


> hi, clkao:
>    thank you for your feedback.
> attached files exact are the same name in SVN server as "未标题", I put them different file name, just for easy describe. 
> first 177 is on '//mirror' already, (before smerge)132 is on '//mylocal ' branch.
> 
> svk smerge //mylocal  //mirror
> 177.pdf and (before smerge)132.pdf are conflict.  I select 't', because i want   (before smerge)132.pdf  as a new revion kept on  SVN server, 't' is right?
> then ,I download the newest revion from SVN, i got 132.pdf.  it was destroied.  anyway, i select 'y' , file was destroied too.
> 
> I am not sure the information is enough or not. if not, pls let me know freely, I will give a list of detail steps to you!
> 
> 
> 
> 
> ----- Original Message ----- 
> From: "Chia-liang Kao" <>
> To: <svk-devel at bestpractical.com>
> Sent: Wednesday, July 30, 2008 3:09 AM
> Subject: Re: [svk-devel] binary file smerge issue
> 
> 
>> 2008/7/27 Tim <leopdong at 163.com>:
>>> 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.
>> 
>> Can you take a quick look to see what's the difference between the doc
>> in the new revision compared to the one on mirror before the revision
>> (in case you chose 'y'), or the one on your local branch (in case you
>> chose 't')?  it'd be very helpful we get some clue like if it's an
>> empty file, or a file with newlines translated or something else.
>> 
>> Cheers,
>> CLK
>> _______________________________________________
>> svk-devel mailing list
>> svk-devel at bestpractical.com
>> http://lists.bestpractical.com/cgi-bin/mailman/listinfo/svk-devel