svn update skipped paths

[Alok Priyadarshi]

I am trying to fix a build issue on ARM. I have narrowed it down to a
problem with svn update.

As you will notice in this log -
http://build.chromium.org/p/chromium/builders/Arm/builds/1760/steps/gclient/logs/stdio
3 files were skipped - glslang_lex.cpp, glslang_tab.cpp, and
glslang_tab.h due to which the build breaks on ARM (and only ARM).

Does someone know why these files are not being updated on ARM?

Thanks,
-Alok

[Nicolas Sylvain]

On Thu, Nov 18, 2010 at 4:41 PM, Alok Priyadarshi <al...@chromium.org> wrote:

I am trying to fix a build issue on ARM. I have narrowed it down to a
problem with svn update.

As you will notice in this log -
http://build.chromium.org/p/chromium/builders/Arm/builds/1760/steps/gclient/logs/stdio
3 files were skipped - glslang_lex.cpp, glslang_tab.cpp, and
glslang_tab.h due to which the build breaks on ARM (and only ARM).

chrome-bot@build8-m1:/b/build/slave/Arm/build/src/third_party/angle/src/compiler  $ svn status

A  +  C glslang_lex.cpp

      >   local edit, incoming delete upon update

A  +  C glslang_tab.h

      >   local edit, incoming delete upon update

A  +  C glslang_tab.cpp

      >   local edit, incoming delete upon update

Something modified those files locally.  And it looks like they got modified (or removed / added) after that, which caused a conflict.

I will revert those files so they can be updated correctly, but we should try to find out what modified them, since this should not happen.

Nicolas

Does someone know why these files are not being updated on ARM?

Thanks,
-Alok

--
Chromium Developers mailing list: chromi...@chromium.org
View archives, change email options, or unsubscribe:
   http://groups.google.com/a/chromium.org/group/chromium-dev

[Mark Larson (Google)]

I'm guessing it's the --force option. 

Without that, gclient/svn would have failed because an unversioned file (the previously generated files) exists where it's trying to put a versioned file.

Nicolas will soon discover that the files need to be deleted (not reverted), and all should be right with the world.

When the repo changes like this, unfortunately, we don't have a push-button solution. Someone has to go in and clean up the dir. (Unless I'm misunderstanding 'clobber'.)

[Alok Priyadarshi]

Thats probably my fault. For a very short period these files were both
checked-in and auto-generated as a build step. This problem has been
fixed now. Deleting or reverting these files should fix it.

Thanks Nicolas.