I banned using "svn revert". It's totally broken.
Use "rm <file> && svn up <file> --revision BASE" instead.
"svn cat chrome/browser/sync/resources/merge_and_sync.html" throws an error
here so the file is broken in the repository so you need to fix that first.
M-A
On Wed, Oct 14, 2009 at 1:04 PM, Tim Steele <t...@chromium.org> wrote:
> The snips were two different files 'cause the actual output was about two
> different files :) The presubmit check doesn't complain about line endings
> with spaces for merge_and_sync.html So from cpu's original email in this
> thread (I just searched my mail for the error), I thought it had to do with
> inconsistent line endings :|
> Running 'svn revert merge_and_sync.html' does nothing. The file remains
> edited. I tried deleting every single line in the file, using the
> advanced-save option to set LF (which is what I've used for this sort of
> thing for years, so I'm pretty sure it's supposed to work) and svn diff
> correctly shows the removal, but svn revert still just does nothing :(
>
>
> On Wed, Oct 14, 2009 at 5:42 AM, Thomas Van Lenten
> <thoma...@chromium.org>wrote:
>
>> Not really sure since the snips you list are two different files, but the
>> warning is not about eol-style, it's about lines ending with spaces, looks
>> on the lines listed for things like:
>> [space][space][real_code][space][space][LF]
>> [space][space][LF]
>>
>> And take the spaces at the *end* of those lines out.
>>
>> TVL
>>
>>
>> On Wed, Oct 14, 2009 at 5:13 AM, Tim Steele <t...@chromium.org> wrote:
>>
>>> I'm getting such an error message for
>>> 'chrome/browser/sync/resources/merge_and_sync.html' come up after the
>>> presubmit checks have run (output shows
>>> <snip>
>>> ** Presubmit Warnings **
>>> Found line ending with white spaces in
>>> ************
>>> ...
>>> chrome\browser\sync\resources\gaia_login.html, line 353************
>>> Presubmit checks took 2.2s to calculate.
>>> There were presubmit warnings. Are you sure you wish to continue? (y/N):
>>> y
>>> Got error status from ['svn', 'cat',
>>> 'chrome/browser/sync/resources/merge_and_sync.html']:
>>> <snip>
>>>
>>> svn:eol-style is set to LF for the file, and I went to 'Advanced Save
>>> Options' in visual studio, selected LF, and saved, and I still get this
>>> error :(
>>> Is there something else I can try?
>>>
>>>
>>> On Wed, Jun 10, 2009 at 9:59 AM, Marc-Antoine Ruel
>>> <mar...@chromium.org>wrote:
>>>
>>>>
>>>> No, Marc-Antoine will enable a presubmit check today (tentative) so it
>>>> won't happen anymore. And if you are a git user, ya better not break
>>>> anything.
>>>>
>>>> M-A
>>>>
>>>> On Wed, Jun 10, 2009 at 12:32 PM, cpu<c...@chromium.org> wrote:
>>>> >
>>>> > I spent a ton of time tracking this so for the record:
>>>> >
>>>> > If you made a change to some files and gcl change works but when you
>>>> > try to do gcl upload you get this error:
>>>> > ====================================
>>>> > Got error status from
>>>> > ['svn', 'cat', '<somefile>']
>>>> > // Copyright (c) 2006-2009 The Chromim authors ..
>>>> > <partial dump of the file here>
>>>> > ====================================
>>>> >
>>>> > Then there are two likely possibilities:
>>>> > 1) the file <somefile> has inconsistent line endings in your copy
>>>> > 2) the file <somefile> has a problem as it exists in the svn server
>>>> >
>>>> > For #1 you can fix in your copy (not my case), for #2 you need to
>>>> > contact Marc-Antoine :)
>>>> >
>>>> > Actually Marc-Antoine will post the magic trick here so he would not
>>>> > get pestered again.
>>>> >
>>>> > >
>>>> >
>>>>
>>>>
>>>>
>>>
>>> >>>
>>>
>>
>
--~--~---------~--~----~------------~-------~--~----~
Chromium Developers mailing list: chromium-dev@googlegroups.com
View archives, change email options, or unsubscribe:
http://groups.google.com/group/chromium-dev
-~----------~----~----~----~------~----~------~--~---
