Dan Nicholson wrote: > On Jan 24, 2008 2:54 PM, Brian Paul <[EMAIL PROTECTED]> wrote: >> Brian Paul wrote: >>> src/mesa/drivers/x11/xm_dd.c | 8 ++++---- >>> src/mesa/state_tracker/st_atom_constbuf.c | 1 + >>> 2 files changed, 5 insertions(+), 4 deletions(-) >>> >>> commit diffs at http://gitweb.freedesktop.org/?p=mesa/mesa.git;a=summary >>> >>> New commits: >>> commit 72d7d2bcc34e3d26f1c4de92f1508c9ddffb3421 >>> Merge: f48e055c1072ca0f3ce3096606a8d892a559c599 >>> 5578f8ce3bf349107b04fb0ebb8b8d505bd9424d >>> Author: Brian <[EMAIL PROTECTED]> >>> Date: Mon Sep 17 12:07:29 2007 -0600 >>> >>> Merge branch 'softpipe_0_1_branch' of git+ssh://[EMAIL >>> PROTECTED]/git/mesa/mesa into softpipe_0_1_branch >>> >>> commit f48e055c1072ca0f3ce3096606a8d892a559c599 >>> Author: Brian <[EMAIL PROTECTED]> >>> Date: Mon Sep 17 10:05:34 2007 -0600 >>> >>> silence warning >>> >>> commit 9ea91974e153858d7c0397bd78448b4be1c10c4c >>> Author: Brian <[EMAIL PROTECTED]> >>> Date: Mon Sep 17 10:05:21 2007 -0600 >>> >>> update begin/end_query() functions >> >> >> >> OK, I think I made a git mistake. I typed 'git-push origin' instead of >> 'git-push origin gallium-0.1'. >> >> My local gallium-0.1 repo seems to be in a funny state but I don't know >> if I've messed up the central repo yet... > > What happens in that case is that you push all the branches in your > local repo that have matching branches in the remote repo. So, if you > had any local commits in master, mesa_7_0_branch, etc., they'd all get > pushed to the equivalent branches in origin. From the looks of it, you > just pushed those 3 commits from your softpipe to origin/softpipe. > But, it wouldn't try to do anything like merge your local softpipe to > origin/master.
OK, I think I just made a mess locally. When I try to do a git-fetch, git-rebase origin/gallium-0.1, I get the following: """ $ git-rebase origin/gallium-0.1 First, rewinding head to replay your work on top of it... HEAD is now at 6c29be9... i915: add case for TGSI_FILE_IMMEDIATE to avoid error, but still needs proper handling... Applying ' Initial 965 GLSL support' Adds trailing whitespace. .dotest/patch:28: GLuint attrs:32; Adds trailing whitespace. .dotest/patch:68: sh_prog->FragmentProgram = Adds trailing whitespace. .dotest/patch:215: struct brw_reg arg1, Adds trailing whitespace. .dotest/patch:269:static void emit_sle( struct brw_compile *p, Adds trailing whitespace. .dotest/patch:277:static void emit_sgt( struct brw_compile *p, warning: squelched 10 whitespace errors warning: 15 lines add trailing whitespaces. Wrote tree 715a9013ab8d12e06f410295d8d3da60ef155376 Committed: db587d2bffbc0a675a1d424c5b7a187002525b7d Applying ' support nested function call else instruction fix.' Adds trailing whitespace. .dotest/patch:48: struct brw_indirect stack_index = brw_indirect(0, 0); warning: 1 line adds trailing whitespaces. Wrote tree 2160d0c47b8764e179ee921bc99b1356ec6e2af8 Committed: afb0d9491459ad784e053544794b92715ca447e2 Applying ' Support loop, conditional update fix' Wrote tree 98f3ce909b8a7a27808cc6fcfc466142fbb0727c Committed: 901689c6f69adedc0c392b9c3cd8beae8830bc18 Applying 'Updated OpenVMS makefiles' error: patch failed: src/mesa/tnl/descrip.mms:1 error: src/mesa/tnl/descrip.mms: patch does not apply Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... 100% (3361/3361) done Auto-merged src/mesa/drivers/osmesa/descrip.mms Auto-merged src/mesa/drivers/x11/descrip.mms Auto-merged src/mesa/main/descrip.mms Auto-merged src/mesa/shader/descrip.mms Auto-merged src/mesa/shader/slang/descrip.mms Auto-merged src/mesa/swrast/descrip.mms Auto-merged src/mesa/swrast_setup/descrip.mms Auto-merged src/mesa/tnl/descrip.mms Wrote tree f76c734bcd0a70127dd847c46ec841cb0293540f Committed: 8543cf888f5f53dc13cf9efb766931ce0cc24477 Applying 'WIP: Replace TTM buffer pool manager with a simplified interface.' Adds trailing whitespace. .dotest/patch:842: * Adds trailing whitespace. .dotest/patch:845: * Adds trailing whitespace. .dotest/patch:853: * Adds trailing whitespace. .dotest/patch:857: * Adds trailing whitespace. .dotest/patch:865: * error: patch failed: src/mesa/drivers/dri/common/dri_bufmgr.c:1 error: src/mesa/drivers/dri/common/dri_bufmgr.c: patch does not apply error: patch failed: src/mesa/drivers/dri/common/dri_bufmgr.h:73 error: src/mesa/drivers/dri/common/dri_bufmgr.h: patch does not apply error: patch failed: src/mesa/drivers/dri/common/dri_drmpool.c:1 error: src/mesa/drivers/dri/common/dri_drmpool.c: patch does not apply Using index info to reconstruct a base tree... Adds trailing whitespace. <stdin>:842: * Adds trailing whitespace. <stdin>:845: * Adds trailing whitespace. <stdin>:853: * Adds trailing whitespace. <stdin>:857: * Adds trailing whitespace. <stdin>:865: * warning: squelched 8 whitespace errors warning: 13 lines add trailing whitespaces. Falling back to patching base and 3-way merge... 100% (3352/3352) done Auto-merged src/mesa/drivers/dri/Makefile.template Auto-merged src/mesa/drivers/dri/common/dri_bufmgr.c CONFLICT (content): Merge conflict in src/mesa/drivers/dri/common/dri_bufmgr.c Auto-merged src/mesa/drivers/dri/common/dri_bufmgr.h CONFLICT (content): Merge conflict in src/mesa/drivers/dri/common/dri_bufmgr.h Removed src/mesa/drivers/dri/common/dri_bufpool.h CONFLICT (delete/modify): src/mesa/drivers/dri/common/dri_drmpool.c deleted in WIP: Replace TTM buffer pool manager with a simplified interface. and modified in HEAD. Version HEAD of src/mesa/drivers/dri/common/dri_drmpool.c left in tree. Failed to merge in the changes. Patch failed at 0005. When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". """ Is there some kind of git-reset that'll restore my repo to the state before the accidental push? I've shot myself in the foot with git-reset in the past and usually recover rm'ing the repo and starting over. -Brian ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ Mesa3d-dev mailing list Mesa3d-dev@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
