On May 23, 2008, at 12:16, Sam Washburn wrote:
> Ryan Schmidt wrote:
>
>> On May 22, 2008, at 00:41, Sam Washburn wrote:
>>
>>> I'm sending this to the user list first just to make sure I'm not
>>> missing
>>> something foolish.
>>>
>>> I have two machines dev and prod. On dev, "svn stat Layouts"
>>> returns
>>> nothing. On prod, "svn stat Layouts" also returns nothing. But
>>> while trying
>>> to track down a really strange bug, I found that the two contain
>>> different
>>> files. prod contains an older file, but when I "svn update
>>> Layouts" on
>>> either machine, they *both* say At revision 120.
>>>
>>> I then did an "svn cat" on the file in question and the repo has
>>> the old
>>> copy. I know I could just copy out that file, get a fresh checkout
>>> and
>>> check back in, but I'm afraid that there might be more files I
>>> don't know
>>> about.
>>>
>>> I thought about stripping out the .svn dirs and re-integrating, but
>>> afaik,
>>> that's a nightmare.
>>>
>>> Does anyone have an idea what's going on and how to fix it? I have
>>> some
>>> tars of the Layouts dir from each box if needed.
>>
>> Try updating the timestamp of the changed file. e.g. on Unix you
>> would "touch" it. Does "svn stat" see it as modified now?
>
> That didn't work, but adding a space somewhere in the file did. If
> I remove
> the space, svn again says that its not been changed, even though
> the files
> are completely different. weird huh?
That says to me that the pristine copy of the file in .svn/text-base
got inadvertently modified too. Maybe you used a batch-modification
tool that didn't know not to go messing with the contents of the .svn
directories? The simplest way to fix this is to check out a new
working copy, manually copy over your changed files from the broken
working copy, then discard the broken working copy and use the new one.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-05-23 23:39:30 CEST