On 6/4/06, Colleen Dick <platypus@peak.org> wrote:
> We can't commit this one critical file.
> All our development is at a standstill until we can get this fixed.
>
> Everything was humming along quite nicely until I tried a commit this
> morning and I got a checksum failure on this one file. So I tried some
> troubleshooting
>
> When I did svn log on this file, the last time the repository thought I
> made any changes to this file was rev 366, but
> locally the entries file said that the last version where I changed that
> file was 379. (I'm now on about 403 or so) No problem I'll just:
> 1) check out the problem directroy version 366,
> 2) hack the entries block from it into the one in my working copy,
> 3) hack the 366 text-base version into my working copy text-base,
> 4) copy version 366 into the working copy and manually apply the diff
> from the latest version No problem. OK, the working copy is working
> locally time to commit.
>
> Now I'm getting this
> Transmitting file data ...svn: Commit failed (details follow):
> svn: Out of date: '/trunk/classes/class.Event.php' in transaction
> '403-1'
> svn: Your commit message was left in a temporary file:
> svn: '/var/www/html/tixrus/svn-commit.6.tmp'
>
> Is there some date I need to tweak?
No, generally, you should stay out of the entire .svn area.
It's too bad you don't have the original error message anymore,
because from that, we could have seen what the problem actually might
be.
You could try checking out a new working copy and moving the changed
files from the old one to the new one. That solves most working copy
problems (most of the time).
> Now here's the scary part: I just did another svn log on that same file
> class.Event.php Previously the log for this file started at rev 366 and
> worked its way backwords. Now the log is claiming the last change to
> this file is rev 66 which was MONTHS AGO!!!
That's because 'svn log' returns all logs for 0:BASE and not for
0:HEAD. Run svn log -r0:HEAD if you want to see all logs for that
directory.
bye,
Erik.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Jun 4 09:23:08 2006