author Wes Kocher <>
Fri, 18 Sep 2015 13:01:25 -0700
changeset 297636 9244da13f5e871e49c066a796f9cf28239a8200e
parent 230872 26a02411f50b9892b74530e74cc3d1b06c22f3fe
child 438232 591f6b2788a91ee51338ae5f7c775dc88cebf303
permissions -rw-r--r--
Backed out 8 changesets (bug 1201796, bug 1196066) for mulet gij(28) failures CLOSED TREE Backed out changeset 159d5d2946d3 (bug 1201796) Backed out changeset 958988218976 (bug 1201796) Backed out changeset 494e7553d641 (bug 1201796) Backed out changeset d58149411b7d (bug 1201796) Backed out changeset 35bd769b49f8 (bug 1196066) Backed out changeset e4f3d4279b4c (bug 1196066) Backed out changeset ca467297fa07 (bug 1196066) Backed out changeset b4851ce6637d (bug 1196066)

This is the ANGLE project, originally from 

The Mozilla upstream is the 'mozilla' branch from, which
includes Mozilla-specific patches on top of upstream.

=== How to upgrade ANGLE ===

1. git clone angle

2. Go into the angle dir, and add the google upstream as a remote:
     git remote add google

3. Fetch the new google upstream:
     git fetch google

4. Switch to the mozilla branch
     git checkout mozilla

5. Rebase the mozilla branch on top of the new google master.  Fix up patches along the way,
   remove unneded commits.  Google seems to have "chromium/2059" branches as well, that I
   assume are merges into the Chromium tree.  These might be a good point to rebase on
   as well, instead of google/master:
     git rebase -i google/master
  or git rebase -i google/chromium/2081  (whatever the latest is in 'git branch -a')

6. Re-generate files:

7. nuke mozilla-central/gfx/angle directory

8. copy all the relevant files from the github checkout
     cd mozilla-central
     mkdir gfx/angle
     cp -r /c/proj/angle/[A-Z]* /c/proj/angle/{include,src,} gfx/angle

9.  Build. Fix things until it builds.

10. Try runs and reviews!

11. Once reviews are done and checkin is ready, tag the equivalent git repo:
    git tag -a mozilla-bug-123456 -m "ANGLE update for bug 123456"

12. Push the new mozilla branch, along with the tags upstream:
    git push --tags mozilla +mozilla

The "mozilla" branch head will keep moving, since it will keep getting rebased.
The tags will point to the topmost commit that was used for a particular bug number,
so that we can see its history if needed.