Permalink
Browse files

notes for myself how to pull upstream ;)

  • Loading branch information...
1 parent c00d5c2 commit 90285a874a02706c04862b207bcf3dfa76eb3130 @aras-p committed Apr 13, 2013
Showing with 20 additions and 0 deletions.
  1. +14 −0 README.md
  2. +6 −0 removeDeletedByUs.sh
View
@@ -66,3 +66,17 @@ Notes
* GLSL versions 1.10 and 1.20 are supported. 1.10 is the default, use #version 120 to specify
1.20.
* GLSL ES version 1.00 is supported.
+
+
+Dev Notes
+---------
+
+Pulling Mesa upstream:
+
+ git fetch upstream master
+ git merge
+ sh removeDeletedByUs.sh
+ # inspect files, git rm unneeded ones, fix conflicts etc.
+ # git commit
+
+
@@ -1,7 +1,13 @@
#! /bin/sh
+git rm -rf bin
git rm -rf docs
+git rm -rf m4
git rm -rf src/egl
+git rm -rf src/glsl/glcpp/tests
+git rm -rf src/mapi
git rm -rf src/mesa/drivers
+git rm -rf src/mesa/main/tests
+git rm -rf src/mesa/state_tracker
git rm -rf src/gallium
git rm -rf src/glx
git rm -rf src/gtest

0 comments on commit 90285a8

Please sign in to comment.