fetch chromium fails while trying to fetch libc++ and libc++abi |
|||||||||
Issue descriptionVersion: 7715e330567f9aab72ed070618723d533457207d OS: Windows This probably happens on other platforms as well. `fetch chromium` failed first and I kept on trying to `gclient sync`. Looks like its failing to checkout the right commit. It says aad34a13af010898f54c1bb2069194cb083cea4b here https://code.google.com/p/chromium/codesearch#chromium/src/buildtools/DEPS&l=8 But it should be b1ece9c037d879843b0b0f5a2802e1e9d443b75a For libc++abi it should be 0edb61e2e581758fc4cd4cd09fc588b3fc91a653 `gclient sync` output below What is the expected output? fetch chromium and gclient sync to succeed. What do you see instead? D:\chrome\src>gclient sync .gclient file in parent directory D:\chrome might not be the file you want to us e Syncing projects: 100% (75/75) src\buildtools\third_party\libc++abi\trunk src\buildtools\third_party\libc++\trunk (ERROR) ---------------------------------------- [0:00:36] Started. [0:00:44] _____ src\buildtools\third_party\libc++\trunk : Attempting rebase onto aad34a13af010898f54c1bb2069194cb083cea4b... [0:00:45] [0:00:45] Rebase produced error output: fatal: Needed a single revision Does not point to a valid commit: aad34a13af010898f54c1bb2069194cb083cea4b ---------------------------------------- Error: 74> Unrecognized error, please merge or rebase manually. 74> cd D:\chrome\src\buildtools\third_party\libc++\trunk && git rebase --onto aa d34a13af010898f54c1bb2069194cb083cea4b refs/remotes/origin/master
,
May 27 2016
,
May 27 2016
,
May 27 2016
Looks like the git mirror is in a weird state? Nothing has changed here recently.
,
May 27 2016
This is breaking official iOS builders as well.
,
May 27 2016
I'm seeing what I believe to be a related issue; running fetch chromium on a new system, I'm seeing the attached output, where [0:09:46] _____ Conflicting directory found in /home/phihag/src/buildtools/third_party/libc++/trunk. Moving to /home/phihag/_bad_scm/src/buildtools/third_party/libc++/trunkHIpS_S. seems to be another symptom of the same problem.
,
May 27 2016
Issue 615304 has been merged into this issue.
,
May 27 2016
It appears this affects anyone pulling a new checkout.
,
May 27 2016
This is my fault, see https://bugs.chromium.org/p/chromium/issues/detail?id=609914 Trying to figure out best resolution now. Not as simple as a revert.
,
May 27 2016
Plan: * Change the new copy-config to only copy refs/heads/master, instead of refs/* * Get access to the old refs on the old git_updater host * Push the old refs to refs/heads/old_svn Then the old git hashes will be accessible to anyone who fetches/clones with the default refspec (refs/heads/*), and will be accessible to gclient which directly fetches the specified hash. Will update again when these steps are completed, or if any roadblocks are hit.
,
May 27 2016
The repos now have the old refs pushed to them under refs/heads/old_svn. I removed my buildtools/ checkout and successfully ran a gclient sync. This should be fixed. Please let me know if you see any continuing failures locally or on bots.
,
May 27 2016
I have triggered an ios build to verify this fix.
,
May 27 2016
Looks good on the iOS side.
,
May 27 2016
Issue 615427 has been merged into this issue.
,
May 27 2016
|
|||||||||
►
Sign in to add a comment |
|||||||||
Comment 1 by mbjorge@chromium.org
, May 27 2016