"git submodule migration is in progress" <- how to fix it?
82 views
Skip to first unread message
이구바
Aug 29, 2023, 11:50:52 PM8/29/23
to Chromium-dev
hi.
I did some code fix. and then did "gclient gitmodules".
finally I did "git cl upload". but error occured.
"""
PS K:\apps-for-contribute\chromium\src> git cl upload
This repo has been enrolled in the stacked changes dogfood.
`git cl upload` now uploads the current branch and all upstream branches that have un-uploaded updates.
Patches can now be reapplied with --force:
`git cl patch --reapply --force`.
Googlers may visit go/stacked-changes-dogfood for more information.
Depot Tools no longer sets new uploads to "WIP". Please update the
"Set new changes to "work in progress" by default" checkbox at
https://<host>-review.googlesource.com/settings/
To opt-out use `export DOGFOOD_STACKED_CHANGES=0`.
To hide this message use `export DOGFOOD_STACKED_CHANGES=1`.
File bugs at https://bit.ly/3Y6opoI
Found change with 29 commits...
Running Python 3 presubmit upload checks ...
checking owners took a long time: 0.6s
checking for commit objects in tree took a long time: 0.8s
** Presubmit Warnings: 1 **
Discovered possible removal of preference registrations.
Please make sure to properly deprecate preferences by clearing their
value for a couple of milestones before finally removing the code.
Otherwise data may stay in the preferences files forever. See
Migrate*Prefs() in chrome/browser/prefs/browser_prefs.cc and
chrome/browser/prefs/README.md for examples.
This may be a false positive warning (e.g. if you move preference
registrations to a different place).
chrome\browser\signin\signin_promo.cc: -void RegisterProfilePrefs(
** Presubmit ERRORS: 1 **
DEPS file indicates git submodule migration is in progress,
but the commit objects do not match DEPS entries.
To reset all git submodule git entries to match DEPS, run
the following command in the root of this repository:
gclient gitmodules
If git submodule changes are correct, update the following DEPS entries to:
chrome/installer/mac/third_party/xz/xz -> 0a629f79fc37a446cb946ed91998d059c017679f
docs/website -> 3d12ccf9c7bf9da45052256d1051806796810184
ios/third_party/earl_grey2/src -> c3732d1bcfa6ed7d25f0e091a7571d4bf604379c
ios/third_party/gtx/src -> 7563d73ea5e9ebed04f6786d94e9368b4d01170d
ios/third_party/lottie/src -> d70b7509abdc216a3c073b4bdcbcc8f5b8c21228
ios/third_party/material_components_ios/src -> bf1c24477e5e8030ec83f117d51d909c83ce9a81
ios/third_party/material_font_disk_loader_ios/src -> 8e30188777b016182658fbaa0a4a020a48183224
ios/third_party/material_roboto_font_loader_ios/src -> bc63eabbbd1e14cee0779b05827e08db2e413553
ios/third_party/material_sprited_animation_view_ios/src -> c6e16d06bdafd95540c62b3402d9414692fbca81
ios/third_party/motion_animator_objc/src -> a0f2d04f8252c15487aa5fc26cc5183860faaaf6
ios/third_party/motion_interchange_objc/src -> 835474053336d2004c079f7d6580f582a7a2b85a
ios/third_party/motion_transitioning_objc/src -> b976b9271ab941bafaa6e22e008dea0445a57fe2
ios/third_party/ochamcrest/src -> 88e0f9bf349b78fc5e1edfeb85f896c0d5a93a60
ios/third_party/webkit/src -> 3ed26b91e481dcec2159ed691ccf6a1042e2bad4
net/third_party/quiche/src -> 37e40568cb4e303d963faf105927ffac6ff85792
third_party/android_prebuilts/build_tools -> 8d78d898cfa8fe5f18bd38c8e92aa2f00d693558
third_party/android_protobuf/src -> af1fed95c5a64222a4d2d5b3ccbe0448c9dc601d
third_party/angle -> 0581a81c8f3ee9409c5564352246cb4ddf18e0a1
third_party/arcore-android-sdk/src -> a304f534de899a45adf7ecdc540ec8c8227fe4e5
third_party/boringssl/src -> e4acd6cb568214b1c7db4e59ce54ea2e1deae1f5
third_party/catapult -> d7f301be80d9243dbd4d5669a67811c7a7848807
third_party/chromevox/third_party/sre/src -> 719573b361403d43f8402070ded7c8d582b1158c
third_party/chromite -> bd3cb41202ea42a0d581ca39f7026174ef20b119
third_party/chromium-variations -> 0953d8000b5d0ab0913bbf23eb1dfee482350580
third_party/content_analysis_sdk/src -> 93f5b9cfe9509a6b58eb0414f1bd610c4859ed1d
third_party/cpuinfo/src -> d7069b3919d1b65da5e8e333cb5817570a30b49a
third_party/cros-components/src -> 6b8fd9182c5063e23f46ed57b1521660433e4563
third_party/cros_system_api -> 944e473803f8075a9dd8376db0b9697157769123
third_party/crossbench -> af7408a3d29371f2b9af364d66ff44099030d430
third_party/dawn -> 47e3312658e36fde6dc8b931cf2ce104c3b46e97
third_party/depot_tools -> 02e70b435732a41d3d251f7c861110c6ee91f65b
third_party/devtools-frontend/src -> 94c3fe0305d73f792cdf6de3fdd5112e69fee416
third_party/emoji-metadata/src -> f117f7e0f2ecce8d707d03d46556a25196f9df55
third_party/fontconfig/src -> e291fda7d42e5d64379555097a066d9c2c4efce3
third_party/freetype/src -> 3829fdaae5f12590f93807e9bcb866be131a201a
third_party/google_toolbox_for_mac/src -> 1b2da5e6e6b5edb1fa1427cc77e23f04069c04ad
third_party/gvr-android-sdk/src -> f6b00dea8dc6a6f8b5e8da8897ade615b170b088
third_party/javalang/src -> 566963547575e93d305871d9cb26ce47ff1a036e
third_party/junit/src -> 16228f3ccea3c6f1170488e0e268f3601d130f75
third_party/libaom/source/libaom -> 92fb72a64e83d1410b5925c8775bf089adbf16af
third_party/libavif/src -> 397f74c8e289386eb7d309b2f8041d8a190db29a
third_party/libc++abi/src -> cc2a32ba831d2246511e0bab34011c48534b405c
third_party/libdrm/src -> 728dfa9dbeeb013e5a26c24f4372a16eace99c5e
third_party/libipp/libipp -> 18b8dd8befdc98570d749e247606c8bff2b8d1ae
third_party/liblouis/src -> a22a14b8867615ea87ff3890388b7d5aafb09bde
third_party/libsync/src -> 074e053f159602aa7558cfb2ae2f3c67878d90e0
third_party/libunwind/src -> b113f23e4c61d00e3e7160a2d36b74d7c179364c
third_party/libvpx/source/libvpx -> e1c124f8965f166d3e9ca26c9215ebc3ec3a1d72
third_party/lss -> 9719c1e1e676814c456b55f5f070eabad6709d31
third_party/material_design_icons/src -> 589092d9a7177a4b9e641f7e790d9cc60ce187a4
third_party/minigbm/src -> 555b38476af648e6a4548ee86990d05b3c575dc1
third_party/nearby/src -> 347d10b74f4b57d8fc832ccc1b9366b7fa298291
third_party/openscreen/src -> 07243a7a79ef256558dcd4c84408e4893516ab12
third_party/pdfium -> 442caf1949dd473f5fc0453c1f39a5d5b01c7383
third_party/perfetto -> 446adf5b7bb431d42838cb0302b27311fa4331cd
third_party/pyelftools -> 0a7d61a388621fae7c11e66b82b916b0885db320
third_party/re2/src -> 9dc7ae7b52a17b75e3f9249ea85ba578bf42f255
third_party/requests/src -> 083aa67a0d3309ebe37eafbe7bfd96c235a019cf
third_party/skia -> b4a893827b2aff55d43be063e8de8f5b44c75365
third_party/swiftshader -> 729e92f8ae07d7b695bdcf346318dec4d11d899e
third_party/tflite/src -> c85a0255eacaf42a348e928df2c1fb13e577905f
third_party/vulkan-deps -> 507cccbe606262fd887a12f858c25722f889a41c
third_party/vulkan_memory_allocator -> e87036508bb156f9986ea959323de1869e328f58
third_party/wayland-protocols/gtk -> 2e415e266fc410b00801071c01c215dc791283df
third_party/wayland-protocols/src -> 463d5cfaf37c8276826cdda48df336b9d2511ed0
third_party/wayland/src -> 678c8681e28739da1fea667ae59118cfc0968497
third_party/webgl/src -> 0343b5704f8abde7662c5eb87a06b52ce0b7f8ca
third_party/webgpu-cts/src -> 9f097553321962196792ea06f5448ce8e17f5c1b
third_party/webrtc -> c59be6d2615eb35b7a60f6f666abd197fde08db5
third_party/weston/src -> d65e819bf7642fbcea6078ca81859f095212d78e
third_party/wlcs/src -> 4c6db9aa05ca38370ab1c6a0c0519066cee141eb
third_party/xdg-utils -> d6ddbd6c92a4975d3e44560b48ca9719b5410b65
tools/page_cycler/acid3 -> 6be0a66a1ebd7ebc5abc1b2f405a945f6d871521
v8 -> fe608691065e23ae83720392bf61a59e8166bee6
Presubmit checks took 14.8s to calculate.
There were Python 3 presubmit errors.
This repo has been enrolled in the stacked changes dogfood.
`git cl upload` now uploads the current branch and all upstream branches that have un-uploaded updates.
Patches can now be reapplied with --force:
`git cl patch --reapply --force`.
Googlers may visit go/stacked-changes-dogfood for more information.
Depot Tools no longer sets new uploads to "WIP". Please update the
"Set new changes to "work in progress" by default" checkbox at
https://<host>-review.googlesource.com/settings/
To opt-out use `export DOGFOOD_STACKED_CHANGES=0`.
To hide this message use `export DOGFOOD_STACKED_CHANGES=1`.
File bugs at https://bit.ly/3Y6opoI
Found change with 29 commits...
Running Python 3 presubmit upload checks ...
checking owners took a long time: 0.6s
checking for commit objects in tree took a long time: 0.8s
** Presubmit Warnings: 1 **
Discovered possible removal of preference registrations.
Please make sure to properly deprecate preferences by clearing their
value for a couple of milestones before finally removing the code.
Otherwise data may stay in the preferences files forever. See
Migrate*Prefs() in chrome/browser/prefs/browser_prefs.cc and
chrome/browser/prefs/README.md for examples.
This may be a false positive warning (e.g. if you move preference
registrations to a different place).
chrome\browser\signin\signin_promo.cc: -void RegisterProfilePrefs(
** Presubmit ERRORS: 1 **
DEPS file indicates git submodule migration is in progress,
but the commit objects do not match DEPS entries.
To reset all git submodule git entries to match DEPS, run
the following command in the root of this repository:
gclient gitmodules
If git submodule changes are correct, update the following DEPS entries to:
chrome/installer/mac/third_party/xz/xz -> 0a629f79fc37a446cb946ed91998d059c017679f
docs/website -> 3d12ccf9c7bf9da45052256d1051806796810184
ios/third_party/earl_grey2/src -> c3732d1bcfa6ed7d25f0e091a7571d4bf604379c
ios/third_party/gtx/src -> 7563d73ea5e9ebed04f6786d94e9368b4d01170d
ios/third_party/lottie/src -> d70b7509abdc216a3c073b4bdcbcc8f5b8c21228
ios/third_party/material_components_ios/src -> bf1c24477e5e8030ec83f117d51d909c83ce9a81
ios/third_party/material_font_disk_loader_ios/src -> 8e30188777b016182658fbaa0a4a020a48183224
ios/third_party/material_roboto_font_loader_ios/src -> bc63eabbbd1e14cee0779b05827e08db2e413553
ios/third_party/material_sprited_animation_view_ios/src -> c6e16d06bdafd95540c62b3402d9414692fbca81
ios/third_party/motion_animator_objc/src -> a0f2d04f8252c15487aa5fc26cc5183860faaaf6
ios/third_party/motion_interchange_objc/src -> 835474053336d2004c079f7d6580f582a7a2b85a
ios/third_party/motion_transitioning_objc/src -> b976b9271ab941bafaa6e22e008dea0445a57fe2
ios/third_party/ochamcrest/src -> 88e0f9bf349b78fc5e1edfeb85f896c0d5a93a60
ios/third_party/webkit/src -> 3ed26b91e481dcec2159ed691ccf6a1042e2bad4
net/third_party/quiche/src -> 37e40568cb4e303d963faf105927ffac6ff85792
third_party/android_prebuilts/build_tools -> 8d78d898cfa8fe5f18bd38c8e92aa2f00d693558
third_party/android_protobuf/src -> af1fed95c5a64222a4d2d5b3ccbe0448c9dc601d
third_party/angle -> 0581a81c8f3ee9409c5564352246cb4ddf18e0a1
third_party/arcore-android-sdk/src -> a304f534de899a45adf7ecdc540ec8c8227fe4e5
third_party/boringssl/src -> e4acd6cb568214b1c7db4e59ce54ea2e1deae1f5
third_party/catapult -> d7f301be80d9243dbd4d5669a67811c7a7848807
third_party/chromevox/third_party/sre/src -> 719573b361403d43f8402070ded7c8d582b1158c
third_party/chromite -> bd3cb41202ea42a0d581ca39f7026174ef20b119
third_party/chromium-variations -> 0953d8000b5d0ab0913bbf23eb1dfee482350580
third_party/content_analysis_sdk/src -> 93f5b9cfe9509a6b58eb0414f1bd610c4859ed1d
third_party/cpuinfo/src -> d7069b3919d1b65da5e8e333cb5817570a30b49a
third_party/cros-components/src -> 6b8fd9182c5063e23f46ed57b1521660433e4563
third_party/cros_system_api -> 944e473803f8075a9dd8376db0b9697157769123
third_party/crossbench -> af7408a3d29371f2b9af364d66ff44099030d430
third_party/dawn -> 47e3312658e36fde6dc8b931cf2ce104c3b46e97
third_party/depot_tools -> 02e70b435732a41d3d251f7c861110c6ee91f65b
third_party/devtools-frontend/src -> 94c3fe0305d73f792cdf6de3fdd5112e69fee416
third_party/emoji-metadata/src -> f117f7e0f2ecce8d707d03d46556a25196f9df55
third_party/fontconfig/src -> e291fda7d42e5d64379555097a066d9c2c4efce3
third_party/freetype/src -> 3829fdaae5f12590f93807e9bcb866be131a201a
third_party/google_toolbox_for_mac/src -> 1b2da5e6e6b5edb1fa1427cc77e23f04069c04ad
third_party/gvr-android-sdk/src -> f6b00dea8dc6a6f8b5e8da8897ade615b170b088
third_party/javalang/src -> 566963547575e93d305871d9cb26ce47ff1a036e
third_party/junit/src -> 16228f3ccea3c6f1170488e0e268f3601d130f75
third_party/libaom/source/libaom -> 92fb72a64e83d1410b5925c8775bf089adbf16af
third_party/libavif/src -> 397f74c8e289386eb7d309b2f8041d8a190db29a
third_party/libc++abi/src -> cc2a32ba831d2246511e0bab34011c48534b405c
third_party/libdrm/src -> 728dfa9dbeeb013e5a26c24f4372a16eace99c5e
third_party/libipp/libipp -> 18b8dd8befdc98570d749e247606c8bff2b8d1ae
third_party/liblouis/src -> a22a14b8867615ea87ff3890388b7d5aafb09bde
third_party/libsync/src -> 074e053f159602aa7558cfb2ae2f3c67878d90e0
third_party/libunwind/src -> b113f23e4c61d00e3e7160a2d36b74d7c179364c
third_party/libvpx/source/libvpx -> e1c124f8965f166d3e9ca26c9215ebc3ec3a1d72
third_party/lss -> 9719c1e1e676814c456b55f5f070eabad6709d31
third_party/material_design_icons/src -> 589092d9a7177a4b9e641f7e790d9cc60ce187a4
third_party/minigbm/src -> 555b38476af648e6a4548ee86990d05b3c575dc1
third_party/nearby/src -> 347d10b74f4b57d8fc832ccc1b9366b7fa298291
third_party/openscreen/src -> 07243a7a79ef256558dcd4c84408e4893516ab12
third_party/pdfium -> 442caf1949dd473f5fc0453c1f39a5d5b01c7383
third_party/perfetto -> 446adf5b7bb431d42838cb0302b27311fa4331cd
third_party/pyelftools -> 0a7d61a388621fae7c11e66b82b916b0885db320
third_party/re2/src -> 9dc7ae7b52a17b75e3f9249ea85ba578bf42f255
third_party/requests/src -> 083aa67a0d3309ebe37eafbe7bfd96c235a019cf
third_party/skia -> b4a893827b2aff55d43be063e8de8f5b44c75365
third_party/swiftshader -> 729e92f8ae07d7b695bdcf346318dec4d11d899e
third_party/tflite/src -> c85a0255eacaf42a348e928df2c1fb13e577905f
third_party/vulkan-deps -> 507cccbe606262fd887a12f858c25722f889a41c
third_party/vulkan_memory_allocator -> e87036508bb156f9986ea959323de1869e328f58
third_party/wayland-protocols/gtk -> 2e415e266fc410b00801071c01c215dc791283df
third_party/wayland-protocols/src -> 463d5cfaf37c8276826cdda48df336b9d2511ed0
third_party/wayland/src -> 678c8681e28739da1fea667ae59118cfc0968497
third_party/webgl/src -> 0343b5704f8abde7662c5eb87a06b52ce0b7f8ca
third_party/webgpu-cts/src -> 9f097553321962196792ea06f5448ce8e17f5c1b
third_party/webrtc -> c59be6d2615eb35b7a60f6f666abd197fde08db5
third_party/weston/src -> d65e819bf7642fbcea6078ca81859f095212d78e
third_party/wlcs/src -> 4c6db9aa05ca38370ab1c6a0c0519066cee141eb
third_party/xdg-utils -> d6ddbd6c92a4975d3e44560b48ca9719b5410b65
tools/page_cycler/acid3 -> 6be0a66a1ebd7ebc5abc1b2f405a945f6d871521
v8 -> fe608691065e23ae83720392bf61a59e8166bee6
Presubmit checks took 14.8s to calculate.
There were Python 3 presubmit errors.
"""
I understood that the core of this error is that "DEPS file indicates git submodule migration is in progress,
but the commit objects do not match DEPS entries."
in summary, "git submodule migration is in progress" is the problem I think.
in error message, this was suggested that "To reset all git submodule git entries to match DEPS, run the following command in the root of this repository: gclient gitmodules "
so I did "gclient gitmodules" but it did not work.
any hint about this ?
thank you.
Reply all
Reply to author
Forward
0 new messages