Karl Fogel wrote:
> Petr Var <PVar@seznam.cz> writes:
>
>> Currently I'm making a merge of new stuff in trunk to my user
>> branch. Most of the merge was fine. But on some files I encounter a
>> problem with checksum mismatch. I have tried different version of
>> svn client (1.3.0, 1.4.3), different machines. I'm doing my merge of
>> course on a clear checkout of the user branch.
>>
>> Here is how the output of the svn client looks like :
>>
>> [petr_at_xxxx gui]$ svn merge -N -r 4985:HEAD http://xxx/trunk/gui
>> G SConscript
>> A post-sm-trunk.bat
>> A pre-sm-trunk.bat
>> A copy2sirius.txt
>> A get-from-sirius.txt
>> svn: Checksum mismatch for 'sm.xml':
>> expected checksum: 3b883d0742c00527376d372dec608cb9
>> actual checksum: 1a0aecd6f781fc7101b6bd56771072a7
>>
>> I don't know, how to get over this. I have made a md5sum of file
>> 'sm.xml' in my user branch and in the trunk and they are identical.
>>
>
> Can you get the checkums of the working file 'sm.xml' and its
> text-base counterpart, '.svn/text-base/sm.xml.svn-base'? If the
> text-base differs from one of the above two checksums, can you
> discover what the text difference is?
>
> Also, you might want to do a diff to see what the merge was trying to
> do to that XML file.
>
> Just suggesting some manual investigation techniques, to narrow down
> the space of possible explanations...
>
> -Karl
>
>
[petr_at_xxxx gui]$ svn merge -N -r 4985:HEAD http://xxx/trunk/gui
G SConscript
A post-sm-trunk.bat
A pre-sm-trunk.bat
A copy2sirius.txt
A get-from-sirius.txt
svn: Checksum mismatch for 'sm.xml':
expected checksum: 3b883d0742c00527376d372dec608cb9
actual checksum: 1a0aecd6f781fc7101b6bd56771072a7
[petr@xxxx gui]$ md5sum .svn/
all-wcprops dir-prop-base entries format
prop-base/ props/ text-base/ tmp/
[petr@xxxx gui]$ md5sum .svn/text-base/
build-help-trunk.bat.svn-base build.xml.svn-base
post-sm-trunk.bat.svn-base rpmmacros.svn-base
sm.xml.svn-base
build-sm-branch.bat.svn-base copy2sirius.txt.svn-base
pre-sm-trunk.bat.svn-base rpmrc.svn-base
build-sm-trunk.bat.svn-base get-from-sirius.txt.svn-base
project.properties.svn-base SConscript.svn-base
[petr@xxxx gui]$ md5sum .svn/text-base/sm.xml.svn-base
873096c22c93dcfde7349c5a828443cd .svn/text-base/sm.xml.svn-base
[petr@xxxx gui]$ md5sum sm.xml
873096c22c93dcfde7349c5a828443cd sm.xml
[petr@xxxx gui]$
So the checksum is the same also with the text-based file. (either with
the file version in the trunk, as I wrote before)
And output of diff
[petr@xxxx gui]$ diff sm.xml .svn/text-base/sm.xml.svn-base
[petr@xxxx gui]$
Thanks for your help
Petr
Received on Thu May 31 21:48:31 2007