Hello Gerrit,
uhm, I may have made a mistake with the sandbox's osg-svn-head branch :(
Before svn moved my sandbox clone had a git svn checkout of the trunk in
it. When I wanted to bring osg-svn-head in sync with trunk I simply
merged changes between the local git-svn branch and the local
osg-svn-head branch and then pushed local osg-svn-head to github's.
I could not figure out how to migrate git svn to a different repository
location and using a new sandbox clone with a fresh git-svn checkout did
not allow proper merging any more - it simply gave a conflict for every
change that was in the trunk but not in osg-svn-head and fixing the
conflicts resulted in one commit that was the union of all that went
into the trunk since when they were last synced.
So I ended up applying a series of patches (using git am) to
osg-svn-head, but looking at what github displays on their commits page
I'm a little worried that things may appear out of sync to git if in
fact the code is the same.
Do you think this is going to be a problem? Any ideas? Sorry, hope I did
not mess things up too badly...
Carsten
------------------------------------------------------------------------------
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
