Re: Cannot checkin anymore ...

On Wednesday 06 June 2007 10:18, johann.petrak@gmail.com wrote:
> svn ci dir1
> # shows: M index.html, after "continue" I get
> # Sending dir1/file1
> # Transmitting file data .svn: Commit failed (details follow):
> # svn: Out of date: <fullpathto dir2/file1> in transaction '2g'
>
> After some playing around, the error message changed and now I get on each
> attempt to checkin files:
>
> Transmitting file data ..........svn: Commit failed (details follow):
> svn: Base checksum mismatch on '<fullpathto dir2/file1>':
> expected: a7794ed137fa069e859241e2fd803217
> actual: 31ac6cdbfecc12606acef924f5a59497
>
> I have no idea how to correct that error and how to make my working copy
> function again.
>
> Oddly, if I check out the file at a different location and then do a
> comparison of the checked out file and the one in my original working copy,
> they are binary equal -- so what is SVN complainin about??

It complains that the 'base' (the pristine copy of the file) does not match
the expectations. This typically happens when you mess around with the
content of the .svn folders.

> SVN is not really helpful in helping me here ... status shows everything is
> ok, none of the commands seems to be able to recover this situation :(

Typically you should be able to repair this with these steps:
1. Move aside 'dir2' which fails to commit.
2. 'svn update'. This will recreate 'dir2'. Optionally, you might want to
update it to the revision it came from.
3. Copy the files inside the original 'dir2' over to the new one, with the
exception of the .svn metadata.
4. If you didn't update to HEAD in step 2, do so now and reserve all
conflicts.
5. Commit.

You should now be able to safely remove the original 'dir2' without loss of
data.

Uli

-- 
Sator Laser GmbH
Geschäftsführer: Ronald Boers, Amtsgericht Hamburg HR B62 932
**************************************************************************************
           Visit our website at <http://www.satorlaser.de/>
**************************************************************************************
Diese E-Mail einschließlich sämtlicher Anhänge ist nur für den Adressaten bestimmt und kann vertrauliche Informationen enthalten. Bitte benachrichtigen Sie den Absender umgehend, falls Sie nicht der beabsichtigte Empfänger sein sollten. Die E-Mail ist in diesem Fall zu löschen und darf weder gelesen, weitergeleitet, veröffentlicht oder anderweitig benutzt werden.
E-Mails können durch Dritte gelesen werden und Viren sowie nichtautorisierte Änderungen enthalten. Sator Laser GmbH ist für diese Folgen nicht verantwortlich.
**************************************************************************************
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org