trinity-devel@lists.pearsoncomputing.net

Message: previous - next
Month: January 2014

Re: [trinity-devel] rebase of 3.5.13 tree drops all non 3.5.13 sources - howto fix?

From: "David C. Rankin" <drankinatty@...>
Date: Tue, 07 Jan 2014 02:00:58 -0600
On 01/04/2014 11:21 AM, Sl�vek Banko wrote:
> 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

Thanks Slavek,

  I new what was happening, I just recall it behaving a bit differently a year
ago. In the past, when I did a checkout of R14 and switched to sru, all of the
R14 modules would remain. Now there is a sru branch for the toplevel of the tree
where before there was not. Therefore, in the past when the submodule foreach
was run, it would loop through all modules and they would be present in the
tree. Now when submodule foreach is run the behavior is exactly how you describe it.

  Attached is an old log from 2012 showing the branches available - now I
understand (sort of..):



-- 
David C. Rankin, J.D.,P.E.
module: common                            branch: master         available: HEAD master
module: tdeaccessibility                  branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: tdeaddons                         branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: tdeadmin                          branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: tdeartwork                        branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: tdebase                           branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: tdebindings                       branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: tdeedu                            branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: tdegames                          branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: tdegraphics                       branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: tdelibs                           branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: tdemultimedia                     branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: tdenetwork                        branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: tdepim                            branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: tdesdk                            branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: tdetoys                           branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: tdeutils                          branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: tdevelop                          branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: tdewebdev                         branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/abakus               branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/adept                branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/amarok               branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/basket               branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/bibletime            branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/compizconfig-backend-kconfig  branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/desktop-effects-tde  branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/digikam              branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/dolphin              branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/filelight            branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/filelight-l10n       branch: master         available: HEAD master
module: applications/fusion-icon          branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/gtk-qt-engine        branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/gwenview             branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/gwenview-i18n        branch: master         available: HEAD master
module: applications/k3b                  branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/k3b-i18n             branch: master         available: HEAD master
module: applications/k9copy               branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/kaffeine             branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/kaffeine-mozilla     branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/katapult             branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/kbarcode             branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/kbfx                 branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/kbookreader          branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/kchmviewer           branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/kcmautostart         branch: master         available: HEAD master
module: applications/kcpuload             branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/kdbusnotification    branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/kdiff3               branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/kdirstat             branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/kdmtheme             branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/kdpkg                branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/keep                 branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/kerry                branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/kgtk-qt3             branch: master         available: HEAD master v3.5.13-sru
module: applications/kile                 branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/kima                 branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/kio-apt              branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/kio-locate           branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/kio-umountwrapper    branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/kiosktool            branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/kmplayer             branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/kmyfirewall          branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/kmymoney             branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/knemo                branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/knetload             branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/knetstats            branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/knetworkmanager8     branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/knetworkmanager9     branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/knights              branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/knowit               branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/knutclient           branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/koffice              branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/koffice-i18n         branch: master         available: HEAD master
module: applications/konversation         branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/kopete-otr           branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/kpicosim             branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/kpilot               branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/kpowersave           branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/kpowersave-nohal     branch: master         available: HEAD master
module: applications/kradio               branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/krename              branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/krusader             branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/ksplash-engine-moodin  branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/ksquirrel            branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/kstreamripper        branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/ksystemlog           branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/ktechlab             branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/ktorrent             branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/kuickshow            branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/kvirc                branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/kvkbd                branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/kvpnc                branch: master         available: HEAD master
module: applications/piklab               branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/potracegui           branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/qt4-tqt-theme-engine  branch: master         available: HEAD master
module: applications/rosegarden           branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/smartcardauth        branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/smb4k                branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/soundkonverter       branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/tde-guidance         branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/tde-style-lipstik    branch: master         available: HEAD master v3.5.13-sru
module: applications/tde-style-qtcurve    branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/tde-systemsettings   branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/tdesudo              branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/tdesvn               branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/tellico              branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/twin-style-crystal   branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/wlassistant          branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: applications/yakuake              branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: dependencies/arts                 branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: dependencies/avahi-tqt            branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: dependencies/dbus-1-tqt           branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: dependencies/dbus-tqt             branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: dependencies/libart-lgpl          branch: master         available: HEAD master
module: dependencies/libcaldav            branch: master         available: HEAD master
module: dependencies/libcarddav           branch: master         available: HEAD master
module: dependencies/python-tqt           branch: master         available: HEAD master
module: dependencies/qt3                  branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: dependencies/sip4-tqt             branch: master         available: HEAD master
module: dependencies/tqca                 branch: master         available: HEAD master
module: dependencies/tqca-tls             branch: master         available: HEAD master
module: dependencies/tqscintilla          branch: master         available: HEAD master
module: dependencies/tqt3                 branch: master         available: HEAD master
module: dependencies/tqtinterface         branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: libraries/kipi-plugins            branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: libraries/libkdcraw               branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: libraries/libkexiv2               branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: libraries/libkipi                 branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: libraries/libksquirrel            branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: libraries/libtqt-perl             branch: master         available: HEAD master
module: libraries/mlt                     branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: libraries/mlt++                   branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: libraries/pytdeextensions         branch: v3.5.13-sru    available: HEAD master v3.5.13-sru
module: libraries/python-trinity          branch: v3.5.13-sru    available: HEAD master v3.5.13-sru