Any ideas here? 1. Whenever I push changes on my master branch I'm seeing:
updating 'refs/heads/master' from 9e8a961dd7d7b717a9fb4ecdea1c1b60ea355efe to a8676c45ccab52117c70f2e90fd820d745261f51 error: remote 'refs/heads/mesa_7_0_branch' is not a strict subset of local ref 'refs/heads/mesa_7_0_branch'. maybe you are not up-to-date and need to pull first? How do I fix that? 2. I can't seem to push changes on my mesa_7_0_branch anymore: $ edit file $ commit file $ git push origin mesa_7_0_branch error: remote 'refs/heads/mesa_7_0_branch' is not a strict subset of local ref 'refs/heads/mesa_7_0_branch'. maybe you are not up-to-date and need to pull first? git fetch Generating pack... Done counting 177 objects. Packing 177 objects...................... Indexing 177 objects. 100% (177/177) done Resolving 80 deltas. 100% (80/80) done * refs/remotes/origin/master: fast forward to branch 'master' of git+ssh://[EMAIL PROTECTED]/git/mesa/mesa old..new: 4fca6bf..a8676c4 * refs/remotes/origin/mesa_7_0_branch: fast forward to branch 'mesa_7_0_branch' of git+ssh://[EMAIL PROTECTED]/git/mesa/mesa old..new: fbcac5a..d38b74a yutani 62$ git rebase origin First, rewinding head to replay your work on top of it... HEAD is now at a8676c4... if light position is local, treat it as a homogeneous coord and divide by W (see bug 11009) Applying 'version should be 7.0' Wrote tree 901a07ea2bd35c5aaad9ec0bf04c46ceba213720 Committed: 03e932e8e7695d48ffdf786353355b552efad02f Applying 'version 7.0, not 7.1' Wrote tree 9654172748e44085d7bb3c56615efd2c9517fecd Committed: 55a450ead43131c0908b701f3ebf6fa2dd844752 Applying 'document glXDestroyPbuffer fix' Wrote tree 6ab46a2ac906eeba8bce1def2474f3937a9ff0f4 Committed: a98d6f9d5cb554a09860b2dadd7357655be2c565 Applying 'fix STATE_HALF_VECTOR value (bug 10987)' error: patch failed: src/mesa/shader/prog_statevars.c:1 error: src/mesa/shader/prog_statevars.c: patch does not apply Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... 100% (1/1) done Wrote tree 68e7a79c117fcacca05aaa9edfd7cc47f19afc4e Committed: e68730ef146c8f0152ac08857bc0020196f2184f Applying 'set version to 7.0' Wrote tree 644bd459df81853bcd8f50b597f108d777674834 Committed: 84912a7d824aada1904d2570ebea29be08464757 $ git-branch master * mesa_7_0_branch $ git push origin mesa_7_0_branch error: remote 'refs/heads/mesa_7_0_branch' is not a strict subset of local ref 'refs/heads/mesa_7_0_branch'. maybe you are not up-to-date and need to pull first? -Brian ------------------------------------------------------------------------- This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ _______________________________________________ Mesa3d-dev mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
