Mozilla stuff


2015-03-19 related to

Gaia UI tests functionalities vs MJS

Gaia UI tests functionalities vs MJS

gaia integration gaia aceptance

get marionetteJS working again

make clean make really-clean


For what it's worth, this is how I rebase, and it works pretty well for me. $ git checkout master $ git pull --rebase upstream master $ git checkout feature-branch $ git rebase master This keeps my master updated from upstream, and allows me to just rebase my feature branches from my local master.


latest emulator nightly builds

2015-03-05 to record stuff


rm -Rf node_modules

Error: Cannot find module 'marionette-client' rm -Rf node_modules TEST_FILES=./apps/calendar/test/marionette/day_view_test.js make test-integration npm install -g n n 0.10.35


Finding regression ranges in b2g


update pull requests

git fetch origin master && git rebase origin/master git mergetool


Gaia Performance tests: Eli Perelman

2014-12-31 My branches.




List all the files for a commit in Git

git show hash_id git diff-tree --no-commit-id --name-only -r hash_id


Make a diff of git new and untracked files

make a diff of git new and untracked files: git diff --no-index /dev/null filename


Gaia Python Functional Integration Tests = gaia-ui tests

Gaia Python Functional Integration Tests = gaia-ui tests
== Gip on treeherder

git checkout -b new_branch from inside other branch

Note to self, when you do git checkout -b new_branch on an old_branch, you are continuing form that old_branch.
So better to start from master, unless you really know what you are doing.


Squashing commits in github


Useful links from Richard using github

Marionette client API documentation

Gaia-UI test API documentation

Submitting a Gaia patch

to update your local repository: git pull --rebase upstream master

git pull --rebase upstream master

to get a clean and updated virtualenv for gaia-ui-test

virtualenv new_env
python develop in gaia-ui-test


Some git commands

To see all availabe branches (similar to available mercurial queues): git branch
To make a new branch: git branch branch_name
To go to a specific branch: git checkout branch_name

To add changes to a github pull request:
git add . (git add --all also removes entries when there are removed files)
git commit -m "your commit message"
git push branch_name

To see changed files between master and your branch:
git diff --name-status master..branch_name

To remove file from git: git rm file_name

How to prevent pushing changes to master (at least without warning):
git config push.default nothing


update master

git fetch upstream
git merge upstream/master