[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: BUG: svn out of sync.. but says its not

From: Sam Washburn <swashburn_at_inovationeering.com>
Date: Fri, 23 May 2008 13:00:50 -0400

They are templates so they are quite small. I'll just copy one of them
here. Considerable differences tho.. its not like its newlines or encoding.

dev:
<span class="Font1 px18
FTColor1"><strong><em>{$Page.Title}</em></strong></span><br>
<div style="float:right">{ShowHTMLImage Image=$Page.Image1
Size="Article"}</div>
<span class="Font1 px14 FTColor8" style="line-height:
16pt">{$Page.Content}</span>

prod, and repo:
{if $Page.Image1 != "/images/spacer.gif"}<div align="center">{ShowHTMLImage
FileName=$Page.Image1}</div>{/if}
<span class="Font1 px16
FTColor1"><strong><em>{$Page.Title}</em></strong></span><br>
{$Page.Content}

-----Original Message-----
From: dglasser_at_gmail.com [mailto:dglasser_at_gmail.com]On Behalf Of David
Glasser
Sent: Friday, May 23, 2008 12:33 PM
To: Sam Washburn
Cc: dev_at_subversion.tigris.org
Subject: Re: BUG: svn out of sync.. but says its not

How different are the files?

--dave

On Thu, May 22, 2008 at 7:13 PM, Sam Washburn
<swashburn_at_inovationeering.com> wrote:
> Hello dev list,
>
> I sent this to the user list first just to make sure I'm not missing
> something foolish. Nobody answered the message, so I'm sending here.
>
> I have two machines dev and prod. I have a "Layouts" dir in a working
copy
> on each. 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 (same as prod). Any new copies also are the same as the repo. 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? Is it a bug?
I
> have some tars of the Layouts dir from each box if needed. Unfortunately,
I
> can't reproduce the bug. Maybe the .svn folders would shed some light?
>
> Thanks in advance!
>
> Sam
>
> P.S. I've been able to workaround by checking out a new copy and running
> diff manually (diff -Nr --brief Layouts Layouts2 | grep -v "\.svn") agains
> the two directories.
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
> For additional commands, e-mail: dev-help_at_subversion.tigris.org
>
>

--
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-05-23 19:01:08 CEST

This is an archived mail posted to the Subversion Dev mailing list.