| Version 4 (modified by , 15 years ago) ( diff ) |
|---|
Developing Chimera with git
I started out developing an extension for Chimera with a git repository. It was possible to import the git repository history into the Chimera subversion repository, using some instructions from google code. I ran the following:
# # Step 1. Create a git svn clone of the Chimera source. # cd /data/src/ mkdir tmp cd tmp/ git svn clone svn+ssh://plato.cgl.ucsf.edu/usr/local/src/svn/chimera/trunk chimera # Wait a long time for this to catch up on 30000+ commits cd chimera git status # Fetch the git repository for my Chimera extension; this does not merge anything. git fetch ssh://weber.cgl.ucsf.edu/data/gitroot/chimera-extension # Create a temporary branch for the fetched repository, and tag its head: git branch tmp $(cut -b-40 .git/FETCH_HEAD) git tag -a -m "Animation last fetch" last tmp # # Step 2. Apply initial commit from my git repository onto the git-svn # INIT_COMMIT=$(git log tmp --pretty=format:%H | tail -1) git checkout $INIT_COMMIT . git commit -C $INIT_COMMIT # # Step 3. Rebase and submit # # Apply all the other commits to the tmp branch; make it the new master branch. git rebase master tmp git branch -M tmp master # Lastly, commit the changes back to the svn repository git svn dcommit
Note:
See TracWiki
for help on using the wiki.
![[Chimera Issue Tracking System]](/trac/chimera/chrome/site/chimera_logo.png)