svn: Checksum mismatch (Was: Re: Unrecoverable conflicts during merge after renaming)

On Thu, Aug 03, 2006 at 09:33:43AM +0200, Jan Normann Nielsen wrote:
> Jens Seidel skrev:
> >Hi,
> >
> >I recently performed a huge merge but got a few errors during it.
> >
> >I use svn version 1.3.0 (r17949).
> >
> Could it be
>
> http://subversion.tigris.org/issues/show_bug.cgi?id=2144

Maybe. It's marked as fixed in 1.3 (which I used) but was also reopened and
later closed again. It could also be 2148. The last bug mentions a
Revision: 0
in the svn info output which I got too.

Since these bugs are already fixed I tried 1.4.0-rc4 from SVN. Now it works
better:

* I checkout an older revision of my repository
* Perform the merge
* Remove a few added files so that I can properly update without conflicts
* svn up

The last update results now in
svn: Checksum mismatch for 'dir/.svn/text-base/file.cc.svn-base'; expected: 'bc0c5b04db8bb787c25b95a61e372452', actual: 'd46738f6464df5a5ec690101b85664bc'

Is it possible that the checksum depends on the file name? I remember that I
renamed this file.

What other reasons could exist for this error? (I need a few information to be
able to reproduce this problem on a really small example, instead of my huge one).

Jens

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Aug 3 16:22:46 2006