Re: [brlcad-devel] Bad Commit for g-nff.c

[Christopher S. M. <br...@ma...>]

On Apr 16, 2012, at 8:23 AM, Tom Browder wrote:

> I need help with svn and the trunk.  I somehow committed a malformed
> g-nff.c (corrected one attached) and now get this error when I try to
> commit the correct one:
> 
> svn: Checksum mismatch for
> '/usr/src/tbrowde/brlcad-svn/brlcad/trunk/src/conv/.svn/text-base/g-nff.c.svn-base';
> expected: '54a890c4d732cdb69896e65a5c3bf5ea', actual:
> '8c6bbfce1bed07d6206ff6fd961e93fd'
> 
> I've tried deleting and updating and svn cleanup and revert but no help.

The committed version is just fine and matches what you attached.  The problem is with your svn-base version.

Somehow your book-keeping files got modified (perhaps a recursive find-perl-replace gone mad, done it myself before).  The cleanup and revert commands merely restore a working copy to your checkout copy.  It's your checkout copy that's bad, so you need to check it out again:  rm -rf src/conv && svn up src/conv

Cheers!
Sean