GNOME Bugzilla – Bug 695008
Regression of submodule support in gnome-shell
Last modified: 2015-08-15 19:34:50 UTC
There seems to be a kind of regression in gnome-shell modules on Damned Lies. While other projects that use submodules are working just fine, gnome-shell insists on non-existence of src/gvc/gvc-mixer-control.c file, which should be checked out from a submodule. We are approaching the string freeze for GNOME 3.8, so I think this is quite a high priority. http://l10n.gnome.org/module/gnome-shell/
I manually fixed it by resetting the git repo on the server. But going back and forth between gnome-3-6 and master generates conflicts again: $ git status # On branch master # Changes not staged for commit: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # (commit or discard the untracked or modified content in submodules) # # modified: src/gvc (modified content) #
We could reset the tree every time before updating. Let me try to cook something for it :)
As my commit was reverted in https://git.gnome.org/browse/gnome-shell/commit/?id=e07379b4065021a28e15c86363ed9128f0477c42 , CC'ing Marc-Antoine. Marc-Antoine: Regarding your revert comment, I cannot "Do a 'git submodule init && git submodule update'." as I don't run l10n.gnome.org, plus you'd have to tell this to every single translator and not only me.
It's actually my comment, copied from earlier commit. Marc-Antoine did the right thing, as damned-lies in theory should handle submodules. I sent an e-mail to gnome-i18n explaining what translators should do.
What's the situation on this? What can we do to help that move forward?
I don't think this is a problem any longer, unless I misunderstood the issue.
The original problem indeed seems fixed (or doesn't get triggered anymore), but the support for submodules is still problematic. damned-lies doesn't know how to react to submodules being moved (like here: <https://l10n.gnome.org/module/f-spot/>) or deleted (see the bottom of <https://l10n.gnome.org/languages/C/gnome-3-18/ui/>). I suppose it requires a manual reset of the git repository from the admin.