trinity-devel@lists.pearsoncomputing.net

Message: previous - next
Month: January 2014

rebase of 3.5.13 tree drops all non 3.5.13 sources - howto fix?

From: "David C. Rankin" <drankinatty@...>
Date: Fri, 03 Jan 2014 02:44:22 -0600
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?

-- 
David C. Rankin, J.D.,P.E.