Let's say that you're updating moonshotUI and that your changes are already on master.
cd ui
- git merge origin/master
+ git pull origin master
Now we'll need to update the debian version number so we can do a fresh build:
Copy these to any test machines you like. You might like a loop something like
for ip in 21 22 23 90; do
- rsync -e ssh -a debian_build root@10.1.10.$ip:/tmp
+ rsync -e ssh -P -a debian_build root@10.1.10.$ip:/tmp
done
That will copy the debian_build directory to the listed machines. Log into these machines and run
dpkg -i packages_you_want_to_install
If dependencies are not installed try running "aptitude install" to fix. Make sure it doesn't "fix" things by removing the package you just installed.
+# Trying aAgain when Tests fail
You can run
git reset --hard
-In the submodule checkout to throw awy your changes if you need to re-merge in some new fixes.
+In the submodule checkout to throw away your changes if you need to re-merge in some new fixes. After this, run git merge again in the submodule and proceed from that point in the instructions.