Hi, On Wed, 2010-03-03 at 18:00 -0600, Carsten Neumann wrote: > Hi Gerrit, >
> > The good thing with git is you can always force it back into shape. > > This is something I would prefer to do. The svn head should always > > be relatable to the svn repository. Ok, I'll push a second svn head > > to the sandbox, do a complete checkout and see where pulling in from > > the svn repo leaves us. > > hm, I guess a first step to undo the damage is to do a > > git reset --hard "before bad commits" > > on my OpenSGSandbox.git clone's osg-svn-head branch and > > git push --force [email protected]:vossg/OpenSGSandbox.git > osg-svn-head:osg-svn-head > > ? If I understand it correctly that would basically put things back into > a state before my mistake, right? > ok, I found some time to look into it. I'm going to reset the whole Sandbox. E.g push the svn-head from my current working dir and replay you changes in the anim_carsten branch. I already did the cleanup, e.g. I linearised and rebased your changes. So your branch is currently sitting on top of the single branch point cadd143e278eeadf1596543cd838cd165e5c495c fixed: typo that prevented exevarchunks from being removed properly from the cache : one exit crash if the cache is destroyed before the elements (one known crash left) which is the last commit you merged into you branch. All the back and forth merging is gone. This should also make it a lot easier to merge the changes back. I would suggest, for the future, instead of merging the master changes into your branch, rebase your branch on top of the new master. This makes it a lot easier to resort and apply your changes to the master and keeps the history a lot cleaner. As these things are meant to be temporary I don't think we have to keep an accurate history around. I you are ok with it I will push to the Sandbox. If you have pending commits it might be a good idea to push them. I will also rebase your branch on top of the than current svn head so we have things in a current state. kind regards gerrit ------------------------------------------------------------------------------ Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev _______________________________________________ Opensg-core mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/opensg-core
