On 10/26/2012 04:48 PM, Petr Mladek wrote:
Either my repo is broken or the steps described at http://wiki.documentfoundation.org/Development/Submodules#What_is_the_impact_for_developers_working_in_the_auxiliary_repositories_.3F are wrong. Well, the line: --- cut --- push things using ./g push ./g push origin <my_branch>:maste --- cut --- sounds really strange. IMHO, ./g push ./g push is a non-sense.
Yeah, by the time I would have got hold of Norbert to ask him what he meant with that, I had already figured out enough of it on my own to get something that looks like it works. For a commit whose content logically just affects helpcontent2, not also core, what I'd do is
git submodule
# sanity check, should display all submodules w/o leading
# '+', '-', or 'U'
cd helpcontent2
git am ... # or whatever
git push
cd ..
git status # should report helpcontent2 as dirty
git commit -m 'Updated helpcontent2' helpcontent2
git push
(Whether the commit/push in core is really necessary, or whether gerrit
would do that automatically I'm not really sure, cf.
<http://lists.freedesktop.org/archives/libreoffice/2012-October/040204.html>
"[Libreoffice-commits] .: 5 commits [...]" However, if it is not
necessary, it should be harmless, as the then-necessary "git pull -r"
would collapse the manual commit into gerrit's automatic one.)
Stephan