On 27 February 2014 13:50, David Aldrich <David.Aldrich_at_emea.nec.com> wrote:
> Hi Ryan
>
> The other suggestions didn't work. Revert does fix the problem. However, I
> wanted a less painless transition to 1.8 when we roll it out to the other
> users in our company.
Did you try Gavin Lambert's suggestion to use TortoiseMerge with the
option to ignore line endings turned off (in settings), and the option
NOT to ignore whitespace differences (toolbar) to find out what the
real differences are?
The conversion process (provided by subversion, not TSVN) is not 100%
reliable and may result in bogus differences. The only completely
reliable method is a fresh checkout. Personally I found that the
conversion worked when I did it, though there may have been the
occasional problem like that which I don't now remember.
Simon
>
> From: Ryan Hathaway [mailto:rghathaway_at_starkcountyohio.gov]
> Sent: 27 February 2014 13:47
> To: users_at_tortoisesvn.tigris.org
> Subject: Re: After upgrade to 1.8 format, TSVN shows some files as modified
>
>
>
> David,
>
>
>
> If the other suggestions did not work, what happens if you tsvn:revert the
> files in question?
>
>
>
>
>
>
> Thank you,
>
>
>
> -Ryan
>
>
>
> Ryan Hathaway
>
> Programmer Analyst
>
>
>
> Office of Alan Harold, Auditor
>
> Stark County Ohio
>
> 110 Central Plaza S
>
> Canton, OH 44702
>
>
>
> 330-451-1414
>
>
>
>
>
> ***Please note: My email address has changed to
> rghathaway_at_starkcountyohio.gov ***
>
>
>>>> Gavin Lambert <tsvn_at_mirality.co.nz> 02/26/14 6:33 PM >>>
> On 27/02/2014 02:45, Quoth David Aldrich:
>> I tried killing tsvncache (and I did a reboot) but some files are
>> still marked 'modified' even though Diff shows no changes.
>>
>> I checked one of the files. svn:eol-style = native and the file has
>> 0D, 0A line endings (i.e. Windows). So this all seems correct.
>
> The files might differ only by whitespace or EOL style. This will make
> them come up as Modified according to the status icons and Check for
> modifications, but you may not see the difference in a diff viewer,
> depending on how you have it configured. (It's pretty common to set it
> to ignore whitespace and EOL differences, so you can see the "real"
> changes more easily.)
>
> In particular if you're using the default Tortoise diff viewer, a
> difference only in EOL style will be shown only in the status bar at the
> bottom, which can be easy to miss.
>
> ------------------------------------------------------
> http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3073683
>
> To unsubscribe from this discussion, e-mail:
> [users-unsubscribe_at_tortoisesvn.tigris.org].
>
>
>
> Click here to report this email as spam.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3073708
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-02-27 15:08:25 CET