On Friday 03 of January 2014 09:44:22 David C. Rankin wrote:
> Slavek, all
>
> After fixing the 3.5.13 source trees I had with:
>
>   git checkout v3.5.13-sru && git pull --rebase
>
> I have missing dependencies. (basically all submodules that did not have a
> v3.5.13-sru branch were wiped out) Example:
>
> On the 3.5.13 tree:
>
> 02:04 phoinix:/dat_f/tde/tde> l1 main/dependencies/
> arts
> avahi-tqt
> dbus-1-tqt
> dbus-tqt
> qt3
> tqtinterface
>
> On R14:
>
> 02:14 phoinix:/dat_e/tde/tde> l1 main/dependencies/
> arts
> avahi-tqt
> dbus-1-tqt
> dbus-tqt
> libart-lgpl
> libcaldav
> libcarddav
> python-tqt
> qt3
> sip4-tqt
> tqca
> tqca-tls
> tqscintilla
> tqt3
> tqtinterface
>
>   So basically libart-lgpl, libcaldav, libcarddav, python-tqt, sip4-tqt,
> tqca, tqca-tls, and tqscintilla were all dropped from the tree. (I'm sure
> I'm missing others under applications/ as well.
>
>   How do I pull all the remaining R14 sources/sub-modules into my new
> 3.5.13 tree? Do I have to do a manual diff of the directory structures and
> then do a manual "git checkout master -- <missing>" for each missing dir
> --or-- is there a better way to do it? The only other way I can think of
> would be to do a full git checkout master and covert the entire tree to
> master and then come back and switch submodules that have v3.5.13-sru
> branches back?
>
>   How do you suggest I fill in the 3.5.13 tree?

Sorry for the late reply.

Some git submodules are removed after switching meta-module 'tde' to 
v3.5.13-sru branch because they simply are not part of it.

For example python-tqt, sip4-tqt, tqca, tqca-tls and tqscintilla are designed 
for tqt3 while v3.5.13-sru branch uses qt3. Therefore these modules are not 
included in v3.5.13-sru branch. Exceptions are libart-lgpl, libcaldav and 
libcarddav. These, however, were included in the GIT later, and so lack the 
branch v3.5.13-sru. Similar is the case with some applications that have been 
added, but are prepared for R14 and do not have v3.5.13-sru branch.

Switching the meta-module 'tde' to v3.5.13-sru branch therefore behaves 
correctly - removes all submodules that are not part of v3.5.13-sru branch. 
Similarly, after switching meta-module 'tde' to the 'master' branch 
submodules will be again returned.

Slavek
--